From d68faa904f8ab0115fd6c079431ee49680b95a2b Mon Sep 17 00:00:00 2001
From: Valerie R Young <valerie@bocoup.com>
Date: Tue, 17 Oct 2017 17:47:52 -0400
Subject: [PATCH] regenerate tests

---
 .../Intl/getCanonicalLocales/success_cases.js | 44 -------------------
 ...elds-after-same-line-gen-computed-names.js |  1 +
 ...ter-same-line-gen-computed-symbol-names.js |  1 +
 ...ields-after-same-line-gen-literal-names.js |  1 +
 ...ter-same-line-gen-static-computed-names.js |  1 +
 ...e-line-gen-static-computed-symbol-names.js |  1 +
 ...fter-same-line-gen-static-literal-names.js |  1 +
 ...fter-same-line-gen-string-literal-names.js |  1 +
 ...s-after-same-line-method-computed-names.js |  1 +
 ...-same-line-method-computed-symbol-names.js |  1 +
 ...ds-after-same-line-method-literal-names.js |  1 +
 ...-same-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...r-same-line-method-static-literal-names.js |  1 +
 ...r-same-line-method-string-literal-names.js |  1 +
 ...me-line-static-async-gen-computed-names.js |  1 +
 ...-static-async-gen-computed-symbol-names.js |  1 +
 ...ame-line-static-async-gen-literal-names.js |  1 +
 ...-static-async-gen-static-computed-names.js |  1 +
 ...-async-gen-static-computed-symbol-names.js |  1 +
 ...e-static-async-gen-static-literal-names.js |  1 +
 ...e-static-async-gen-string-literal-names.js |  1 +
 ...line-static-async-method-computed-names.js |  1 +
 ...atic-async-method-computed-symbol-names.js |  1 +
 ...-line-static-async-method-literal-names.js |  1 +
 ...atic-async-method-static-computed-names.js |  1 +
 ...ync-method-static-computed-symbol-names.js |  1 +
 ...tatic-async-method-static-literal-names.js |  1 +
 ...tatic-async-method-string-literal-names.js |  1 +
 ...ter-same-line-static-gen-computed-names.js |  1 +
 ...e-line-static-gen-computed-symbol-names.js |  1 +
 ...fter-same-line-static-gen-literal-names.js |  1 +
 ...e-line-static-gen-static-computed-names.js |  1 +
 ...static-gen-static-computed-symbol-names.js |  1 +
 ...me-line-static-gen-static-literal-names.js |  1 +
 ...me-line-static-gen-string-literal-names.js |  1 +
 ...-same-line-static-method-computed-names.js |  1 +
 ...ine-static-method-computed-symbol-names.js |  1 +
 ...r-same-line-static-method-literal-names.js |  1 +
 ...ine-static-method-static-computed-names.js |  1 +
 ...tic-method-static-computed-symbol-names.js |  1 +
 ...line-static-method-static-literal-names.js |  1 +
 ...line-static-method-string-literal-names.js |  1 +
 ...lds-multiple-definitions-computed-names.js |  1 +
 ...tiple-definitions-computed-symbol-names.js |  1 +
 ...elds-multiple-definitions-literal-names.js |  1 +
 ...tiple-definitions-static-computed-names.js |  1 +
 ...efinitions-static-computed-symbol-names.js |  1 +
 ...ltiple-definitions-static-literal-names.js |  1 +
 ...ltiple-definitions-string-literal-names.js |  1 +
 ...iple-stacked-definitions-computed-names.js |  1 +
 ...acked-definitions-computed-symbol-names.js |  1 +
 ...tiple-stacked-definitions-literal-names.js |  1 +
 ...acked-definitions-static-computed-names.js |  1 +
 ...efinitions-static-computed-symbol-names.js |  1 +
 ...tacked-definitions-static-literal-names.js |  1 +
 ...tacked-definitions-string-literal-names.js |  1 +
 ...ds-new-no-sc-line-method-computed-names.js |  1 +
 ...no-sc-line-method-computed-symbol-names.js |  1 +
 ...lds-new-no-sc-line-method-literal-names.js |  1 +
 ...no-sc-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...-no-sc-line-method-static-literal-names.js |  1 +
 ...-no-sc-line-method-string-literal-names.js |  1 +
 .../fields-new-sc-line-gen-computed-names.js  |  1 +
 ...s-new-sc-line-gen-computed-symbol-names.js |  1 +
 .../fields-new-sc-line-gen-literal-names.js   |  1 +
 ...s-new-sc-line-gen-static-computed-names.js |  1 +
 ...c-line-gen-static-computed-symbol-names.js |  1 +
 ...ds-new-sc-line-gen-static-literal-names.js |  1 +
 ...ds-new-sc-line-gen-string-literal-names.js |  1 +
 ...ields-new-sc-line-method-computed-names.js |  1 +
 ...ew-sc-line-method-computed-symbol-names.js |  1 +
 ...fields-new-sc-line-method-literal-names.js |  1 +
 ...ew-sc-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...new-sc-line-method-static-literal-names.js |  1 +
 ...new-sc-line-method-string-literal-names.js |  1 +
 ...elds-regular-definitions-computed-names.js |  1 +
 ...gular-definitions-computed-symbol-names.js |  1 +
 ...ields-regular-definitions-literal-names.js |  1 +
 ...gular-definitions-static-computed-names.js |  1 +
 ...efinitions-static-computed-symbol-names.js |  1 +
 ...egular-definitions-static-literal-names.js |  1 +
 ...egular-definitions-string-literal-names.js |  1 +
 ...elds-same-line-async-gen-computed-names.js |  1 +
 ...me-line-async-gen-computed-symbol-names.js |  1 +
 ...ields-same-line-async-gen-literal-names.js |  1 +
 ...me-line-async-gen-static-computed-names.js |  1 +
 ...-async-gen-static-computed-symbol-names.js |  1 +
 ...ame-line-async-gen-static-literal-names.js |  1 +
 ...ame-line-async-gen-string-literal-names.js |  1 +
 ...s-same-line-async-method-computed-names.js |  1 +
 ...line-async-method-computed-symbol-names.js |  1 +
 ...ds-same-line-async-method-literal-names.js |  1 +
 ...line-async-method-static-computed-names.js |  1 +
 ...ync-method-static-computed-symbol-names.js |  1 +
 ...-line-async-method-static-literal-names.js |  1 +
 ...-line-async-method-string-literal-names.js |  1 +
 .../fields-same-line-gen-computed-names.js    |  1 +
 ...lds-same-line-gen-computed-symbol-names.js |  1 +
 .../fields-same-line-gen-literal-names.js     |  1 +
 ...lds-same-line-gen-static-computed-names.js |  1 +
 ...e-line-gen-static-computed-symbol-names.js |  1 +
 ...elds-same-line-gen-static-literal-names.js |  1 +
 ...elds-same-line-gen-string-literal-names.js |  1 +
 .../fields-same-line-method-computed-names.js |  1 +
 ...-same-line-method-computed-symbol-names.js |  1 +
 .../fields-same-line-method-literal-names.js  |  1 +
 ...-same-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...s-same-line-method-static-literal-names.js |  1 +
 ...s-same-line-method-string-literal-names.js |  1 +
 .../fields-wrapped-in-sc-computed-names.js    |  1 +
 ...lds-wrapped-in-sc-computed-symbol-names.js |  1 +
 .../fields-wrapped-in-sc-literal-names.js     |  1 +
 ...lds-wrapped-in-sc-static-computed-names.js |  1 +
 ...pped-in-sc-static-computed-symbol-names.js |  1 +
 ...elds-wrapped-in-sc-static-literal-names.js |  1 +
 ...elds-wrapped-in-sc-string-literal-names.js |  1 +
 ...elds-after-same-line-gen-computed-names.js |  1 +
 ...ter-same-line-gen-computed-symbol-names.js |  1 +
 ...ields-after-same-line-gen-literal-names.js |  1 +
 ...ter-same-line-gen-static-computed-names.js |  1 +
 ...e-line-gen-static-computed-symbol-names.js |  1 +
 ...fter-same-line-gen-static-literal-names.js |  1 +
 ...fter-same-line-gen-string-literal-names.js |  1 +
 ...s-after-same-line-method-computed-names.js |  1 +
 ...-same-line-method-computed-symbol-names.js |  1 +
 ...ds-after-same-line-method-literal-names.js |  1 +
 ...-same-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...r-same-line-method-static-literal-names.js |  1 +
 ...r-same-line-method-string-literal-names.js |  1 +
 ...me-line-static-async-gen-computed-names.js |  1 +
 ...-static-async-gen-computed-symbol-names.js |  1 +
 ...ame-line-static-async-gen-literal-names.js |  1 +
 ...-static-async-gen-static-computed-names.js |  1 +
 ...-async-gen-static-computed-symbol-names.js |  1 +
 ...e-static-async-gen-static-literal-names.js |  1 +
 ...e-static-async-gen-string-literal-names.js |  1 +
 ...line-static-async-method-computed-names.js |  1 +
 ...atic-async-method-computed-symbol-names.js |  1 +
 ...-line-static-async-method-literal-names.js |  1 +
 ...atic-async-method-static-computed-names.js |  1 +
 ...ync-method-static-computed-symbol-names.js |  1 +
 ...tatic-async-method-static-literal-names.js |  1 +
 ...tatic-async-method-string-literal-names.js |  1 +
 ...ter-same-line-static-gen-computed-names.js |  1 +
 ...e-line-static-gen-computed-symbol-names.js |  1 +
 ...fter-same-line-static-gen-literal-names.js |  1 +
 ...e-line-static-gen-static-computed-names.js |  1 +
 ...static-gen-static-computed-symbol-names.js |  1 +
 ...me-line-static-gen-static-literal-names.js |  1 +
 ...me-line-static-gen-string-literal-names.js |  1 +
 ...-same-line-static-method-computed-names.js |  1 +
 ...ine-static-method-computed-symbol-names.js |  1 +
 ...r-same-line-static-method-literal-names.js |  1 +
 ...ine-static-method-static-computed-names.js |  1 +
 ...tic-method-static-computed-symbol-names.js |  1 +
 ...line-static-method-static-literal-names.js |  1 +
 ...line-static-method-string-literal-names.js |  1 +
 ...lds-multiple-definitions-computed-names.js |  1 +
 ...tiple-definitions-computed-symbol-names.js |  1 +
 ...elds-multiple-definitions-literal-names.js |  1 +
 ...tiple-definitions-static-computed-names.js |  1 +
 ...efinitions-static-computed-symbol-names.js |  1 +
 ...ltiple-definitions-static-literal-names.js |  1 +
 ...ltiple-definitions-string-literal-names.js |  1 +
 ...iple-stacked-definitions-computed-names.js |  1 +
 ...acked-definitions-computed-symbol-names.js |  1 +
 ...tiple-stacked-definitions-literal-names.js |  1 +
 ...acked-definitions-static-computed-names.js |  1 +
 ...efinitions-static-computed-symbol-names.js |  1 +
 ...tacked-definitions-static-literal-names.js |  1 +
 ...tacked-definitions-string-literal-names.js |  1 +
 ...ds-new-no-sc-line-method-computed-names.js |  1 +
 ...no-sc-line-method-computed-symbol-names.js |  1 +
 ...lds-new-no-sc-line-method-literal-names.js |  1 +
 ...no-sc-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...-no-sc-line-method-static-literal-names.js |  1 +
 ...-no-sc-line-method-string-literal-names.js |  1 +
 .../fields-new-sc-line-gen-computed-names.js  |  1 +
 ...s-new-sc-line-gen-computed-symbol-names.js |  1 +
 .../fields-new-sc-line-gen-literal-names.js   |  1 +
 ...s-new-sc-line-gen-static-computed-names.js |  1 +
 ...c-line-gen-static-computed-symbol-names.js |  1 +
 ...ds-new-sc-line-gen-static-literal-names.js |  1 +
 ...ds-new-sc-line-gen-string-literal-names.js |  1 +
 ...ields-new-sc-line-method-computed-names.js |  1 +
 ...ew-sc-line-method-computed-symbol-names.js |  1 +
 ...fields-new-sc-line-method-literal-names.js |  1 +
 ...ew-sc-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...new-sc-line-method-static-literal-names.js |  1 +
 ...new-sc-line-method-string-literal-names.js |  1 +
 ...elds-regular-definitions-computed-names.js |  1 +
 ...gular-definitions-computed-symbol-names.js |  1 +
 ...ields-regular-definitions-literal-names.js |  1 +
 ...gular-definitions-static-computed-names.js |  1 +
 ...efinitions-static-computed-symbol-names.js |  1 +
 ...egular-definitions-static-literal-names.js |  1 +
 ...egular-definitions-string-literal-names.js |  1 +
 ...elds-same-line-async-gen-computed-names.js |  1 +
 ...me-line-async-gen-computed-symbol-names.js |  1 +
 ...ields-same-line-async-gen-literal-names.js |  1 +
 ...me-line-async-gen-static-computed-names.js |  1 +
 ...-async-gen-static-computed-symbol-names.js |  1 +
 ...ame-line-async-gen-static-literal-names.js |  1 +
 ...ame-line-async-gen-string-literal-names.js |  1 +
 ...s-same-line-async-method-computed-names.js |  1 +
 ...line-async-method-computed-symbol-names.js |  1 +
 ...ds-same-line-async-method-literal-names.js |  1 +
 ...line-async-method-static-computed-names.js |  1 +
 ...ync-method-static-computed-symbol-names.js |  1 +
 ...-line-async-method-static-literal-names.js |  1 +
 ...-line-async-method-string-literal-names.js |  1 +
 .../fields-same-line-gen-computed-names.js    |  1 +
 ...lds-same-line-gen-computed-symbol-names.js |  1 +
 .../fields-same-line-gen-literal-names.js     |  1 +
 ...lds-same-line-gen-static-computed-names.js |  1 +
 ...e-line-gen-static-computed-symbol-names.js |  1 +
 ...elds-same-line-gen-static-literal-names.js |  1 +
 ...elds-same-line-gen-string-literal-names.js |  1 +
 .../fields-same-line-method-computed-names.js |  1 +
 ...-same-line-method-computed-symbol-names.js |  1 +
 .../fields-same-line-method-literal-names.js  |  1 +
 ...-same-line-method-static-computed-names.js |  1 +
 ...ine-method-static-computed-symbol-names.js |  1 +
 ...s-same-line-method-static-literal-names.js |  1 +
 ...s-same-line-method-string-literal-names.js |  1 +
 .../fields-wrapped-in-sc-computed-names.js    |  1 +
 ...lds-wrapped-in-sc-computed-symbol-names.js |  1 +
 .../fields-wrapped-in-sc-literal-names.js     |  1 +
 ...lds-wrapped-in-sc-static-computed-names.js |  1 +
 ...pped-in-sc-static-computed-symbol-names.js |  1 +
 ...elds-wrapped-in-sc-static-literal-names.js |  1 +
 ...elds-wrapped-in-sc-string-literal-names.js |  1 +
 239 files changed, 238 insertions(+), 44 deletions(-)
 delete mode 100644 test/intl402/Intl/getCanonicalLocales/success_cases.js

diff --git a/test/intl402/Intl/getCanonicalLocales/success_cases.js b/test/intl402/Intl/getCanonicalLocales/success_cases.js
deleted file mode 100644
index 7fbac4a575..0000000000
--- a/test/intl402/Intl/getCanonicalLocales/success_cases.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
-// Copyright 2012  Mozilla Corporation. All rights reserved.
-// Copyright 2017 Microsoft Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: intl.getcanonicallocales
-description: Tests the getCanonicalLocales for locale tags.
-info: >
-  Intl.getCanonicalLocales (locales)
-  1. Let ll be ? CanonicalizeLocaleList(locales).
-  2. Return CreateArrayFromList(ll).
----*/
-
-var canonicalizedTags = {
-    "de": ["de"],
-    "de-DE": ["de-DE", "de"],
-    "DE-de": ["de-DE", "de"],
-    "cmn": ["cmn"],
-    "CMN-hANS": ["cmn-Hans", "cmn"],
-    "cmn-hans-cn": ["cmn-Hans-CN", "cmn-Hans", "cmn"],
-    "es-419": ["es-419", "es"],
-    "es-419-u-nu-latn": ["es-419-u-nu-latn", "es-419", "es", "es-u-nu-latn"],
-    "cmn-hans-cn-u-ca-t-ca-x-t-u": ["cmn-Hans-CN-t-ca-u-ca-x-t-u", "cmn-Hans-CN-t-ca-x-t-u", "cmn-Hans-CN-t-ca-x-t", "cmn-Hans-CN-t-ca", "cmn-Hans-CN", "cmn-Hans", "cmn"],
-    "de-gregory-u-ca-gregory": ["de-gregory-u-ca-gregory", "de-gregory", "de-u-ca-gregory", "de"],
-    "no-nyn": ["nn"],
-    "i-klingon": ["tlh"],
-    "sgn-GR": ["gss"],
-    "ji": ["yi"],
-    "de-DD": ["de-DE", "de"],
-    "zh-hak-CN": ["hak-CN", "hak"],
-    "sgn-ils": ["ils"],
-    "in": ["id"],
-    "x-foo": ["x-foo"]
-};
-
-Object.keys(canonicalizedTags).forEach(function (tag) {
-    let locale = Intl.getCanonicalLocales(tag);
-    let expected = canonicalizedTags[tag];
-    assert(
-        expected.includes(locale[0]),
-        `For ${tag} got ${locale}; expected one of ${expected.join(", ")}`,
-    );
-});
diff --git a/test/language/expressions/class/fields-after-same-line-gen-computed-names.js b/test/language/expressions/class/fields-after-same-line-gen-computed-names.js
index 9f9b7ef8bc..c83a5dd29d 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: Computed property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-gen-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-gen-computed-symbol-names.js
index 0c499e62f0..df44ad1d31 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: Computed property symbol names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-gen-literal-names.js b/test/language/expressions/class/fields-after-same-line-gen-literal-names.js
index aa218f25cd..3b7f426cf5 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: Literal property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-gen-static-computed-names.js b/test/language/expressions/class/fields-after-same-line-gen-static-computed-names.js
index 8d0b9c1f07..b1f1f95edb 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-static-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: Static Computed property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-gen-static-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-gen-static-computed-symbol-names.js
index 155dc4e405..79bb5134ab 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: Static computed property symbol names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-gen-static-literal-names.js b/test/language/expressions/class/fields-after-same-line-gen-static-literal-names.js
index d2ec567a15..f6e347b947 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-static-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: Static literal property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-gen-string-literal-names.js b/test/language/expressions/class/fields-after-same-line-gen-string-literal-names.js
index 6f19d71f98..91835466ac 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-string-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-gen.template
 /*---
 description: String literal names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-computed-names.js b/test/language/expressions/class/fields-after-same-line-method-computed-names.js
index 8fe754570a..9ea365d415 100644
--- a/test/language/expressions/class/fields-after-same-line-method-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: Computed property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-method-computed-symbol-names.js
index 0a4e57f10b..78cf52e389 100644
--- a/test/language/expressions/class/fields-after-same-line-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: Computed property symbol names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-literal-names.js b/test/language/expressions/class/fields-after-same-line-method-literal-names.js
index 009163696f..86eb9b5794 100644
--- a/test/language/expressions/class/fields-after-same-line-method-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: Literal property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-static-computed-names.js b/test/language/expressions/class/fields-after-same-line-method-static-computed-names.js
index 4865b6fe79..b28a11e2ee 100644
--- a/test/language/expressions/class/fields-after-same-line-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: Static Computed property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-method-static-computed-symbol-names.js
index 8839e0ce1e..bfe62d6b9e 100644
--- a/test/language/expressions/class/fields-after-same-line-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: Static computed property symbol names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-static-literal-names.js b/test/language/expressions/class/fields-after-same-line-method-static-literal-names.js
index 42b9016dd1..4767ff8947 100644
--- a/test/language/expressions/class/fields-after-same-line-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: Static literal property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-method-string-literal-names.js b/test/language/expressions/class/fields-after-same-line-method-string-literal-names.js
index 5300a0c8d1..4f393da149 100644
--- a/test/language/expressions/class/fields-after-same-line-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-method.template
 /*---
 description: String literal names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-names.js
index c3b243b1e3..bf8a4bdeb9 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: Computed property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-symbol-names.js
index 2434978570..6bb1f56089 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: Computed property symbol names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-literal-names.js
index d8d86abf26..1fb3501f8d 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: Literal property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-names.js
index 1d2c9a0372..ad0b5b741c 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: Static Computed property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js
index 811a826834..8946ee477b 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: Static computed property symbol names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-literal-names.js
index 5032f33568..62524d9b0f 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: Static literal property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-string-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-string-literal-names.js
index 679ea63d9f..bb42ef8fca 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-string-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
 /*---
 description: String literal names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-computed-names.js
index 74fd21f74c..5f1fff697d 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: Computed property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-computed-symbol-names.js
index 92b1ebe4f7..071c3e4e1a 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: Computed property symbol names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-literal-names.js
index 6c4f1eee17..f2a3391cfc 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: Literal property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-names.js
index efda60ad8e..a89010e654 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: Static Computed property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js
index d4a1a2f5d7..4a0983ac61 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: Static computed property symbol names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-static-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-static-literal-names.js
index 14ad36f9a2..c02d0b1f9c 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: Static literal property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-string-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-string-literal-names.js
index 6cdf722408..1503ccc530 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-async-method.template
 /*---
 description: String literal names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-computed-names.js
index a49779eae4..b9a5995a09 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: Computed property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-computed-symbol-names.js
index 5154f6eaaa..9840532b1b 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: Computed property symbol names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-literal-names.js
index ff4fc34093..c8f64f1a09 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: Literal property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-names.js
index 2244f51adf..c45be693a9 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: Static Computed property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-symbol-names.js
index aed7ddbe08..43edb43f10 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: Static computed property symbol names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-static-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-static-literal-names.js
index 7af011fd69..8e7d85531a 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-static-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: Static literal property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-string-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-string-literal-names.js
index 20042a5ef3..9cc72a6fc9 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-string-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-gen.template
 /*---
 description: String literal names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-method-computed-names.js
index 37be15ceb9..a941be27e5 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: Computed property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-method-computed-symbol-names.js
index 246b66937a..1eebc6280a 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: Computed property symbol names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-method-literal-names.js
index 377f87bd40..2019767e1e 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: Literal property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-static-computed-names.js b/test/language/expressions/class/fields-after-same-line-static-method-static-computed-names.js
index ab26d3ec91..d4606dca5b 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: Static Computed property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-after-same-line-static-method-static-computed-symbol-names.js
index a90ed6a0d9..b24c07b5a6 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: Static computed property symbol names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-static-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-method-static-literal-names.js
index ba6f33f52f..145ebc858b 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: Static literal property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-string-literal-names.js b/test/language/expressions/class/fields-after-same-line-static-method-string-literal-names.js
index 3dc5dfd8f4..912d3fd842 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-static-method.template
 /*---
 description: String literal names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-computed-names.js b/test/language/expressions/class/fields-multiple-definitions-computed-names.js
index 866ec5701b..416ad8c13b 100644
--- a/test/language/expressions/class/fields-multiple-definitions-computed-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: Computed property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-computed-symbol-names.js b/test/language/expressions/class/fields-multiple-definitions-computed-symbol-names.js
index bb8fe34cc9..8519a7ca22 100644
--- a/test/language/expressions/class/fields-multiple-definitions-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: Computed property symbol names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-literal-names.js b/test/language/expressions/class/fields-multiple-definitions-literal-names.js
index 03ebe8393e..363a59ef61 100644
--- a/test/language/expressions/class/fields-multiple-definitions-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: Literal property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-static-computed-names.js b/test/language/expressions/class/fields-multiple-definitions-static-computed-names.js
index 6719e95bcf..8cad37f657 100644
--- a/test/language/expressions/class/fields-multiple-definitions-static-computed-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: Static Computed property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-static-computed-symbol-names.js b/test/language/expressions/class/fields-multiple-definitions-static-computed-symbol-names.js
index 188a88cc47..532e33e6fe 100644
--- a/test/language/expressions/class/fields-multiple-definitions-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: Static computed property symbol names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-static-literal-names.js b/test/language/expressions/class/fields-multiple-definitions-static-literal-names.js
index 746e8d0aca..41582a4765 100644
--- a/test/language/expressions/class/fields-multiple-definitions-static-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: Static literal property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-definitions-string-literal-names.js b/test/language/expressions/class/fields-multiple-definitions-string-literal-names.js
index 907c3c0001..01d14e5548 100644
--- a/test/language/expressions/class/fields-multiple-definitions-string-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-definitions.template
 /*---
 description: String literal names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-computed-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-computed-names.js
index 697e48095f..5edb040779 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-computed-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: Computed property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-computed-symbol-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-computed-symbol-names.js
index a418803196..ebfb312d38 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: Computed property symbol names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-literal-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-literal-names.js
index a95a1a4676..b03279776e 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: Literal property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-names.js
index 5e683cf18a..d41fc55b61 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: Static Computed property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js
index ae4d6fb0e7..c4ae11ed6f 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: Static computed property symbol names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-static-literal-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-static-literal-names.js
index 5fd30b12ac..36dd4190a0 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-static-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: Static literal property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-string-literal-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-string-literal-names.js
index 7c344387e4..9b21d9a004 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-string-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-multiple-stacked-definitions.template
 /*---
 description: String literal names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-computed-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-computed-names.js
index 13acd9c02c..7b378eb56a 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-computed-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: Computed property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-computed-symbol-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-computed-symbol-names.js
index 696ff2ee7a..e986e9a250 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-literal-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-literal-names.js
index 2ab87c8352..33007a0f15 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-literal-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: Literal property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-names.js
index 567ab498cd..8a3b917eac 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: Static Computed property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-symbol-names.js
index 48c591186d..661596f15d 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-static-literal-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-static-literal-names.js
index 2d36d9e12a..ff5e5d6ecd 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: Static literal property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-string-literal-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-string-literal-names.js
index fd1e0abd9d..bb0f8ad79b 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-no-sc-line-method.template
 /*---
 description: String literal names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-computed-names.js b/test/language/expressions/class/fields-new-sc-line-gen-computed-names.js
index 7d96e0da3c..90ce595755 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-computed-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-computed-symbol-names.js b/test/language/expressions/class/fields-new-sc-line-gen-computed-symbol-names.js
index b50258a4e1..53ea165611 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-literal-names.js b/test/language/expressions/class/fields-new-sc-line-gen-literal-names.js
index 658720f81a..d72b29e1c1 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-literal-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-static-computed-names.js b/test/language/expressions/class/fields-new-sc-line-gen-static-computed-names.js
index 605edea858..43aa375b2a 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-static-computed-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: Static Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-static-computed-symbol-names.js b/test/language/expressions/class/fields-new-sc-line-gen-static-computed-symbol-names.js
index f4fcaed52a..38e0979436 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-static-literal-names.js b/test/language/expressions/class/fields-new-sc-line-gen-static-literal-names.js
index d4c00a46c7..25263cd726 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-static-literal-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: Static literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-string-literal-names.js b/test/language/expressions/class/fields-new-sc-line-gen-string-literal-names.js
index 835a3b47fa..a9054101c2 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-string-literal-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-generator.template
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-computed-names.js b/test/language/expressions/class/fields-new-sc-line-method-computed-names.js
index 48be4af9cd..afb17620df 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-computed-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-computed-symbol-names.js b/test/language/expressions/class/fields-new-sc-line-method-computed-symbol-names.js
index 365b13fa32..a8c0c3fffe 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-literal-names.js b/test/language/expressions/class/fields-new-sc-line-method-literal-names.js
index b1f5a672fb..3d533ee809 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-literal-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-static-computed-names.js b/test/language/expressions/class/fields-new-sc-line-method-static-computed-names.js
index 4a0808517a..bf2ebf7bca 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: Static Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-new-sc-line-method-static-computed-symbol-names.js
index 30192a74b7..195d9ff007 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-static-literal-names.js b/test/language/expressions/class/fields-new-sc-line-method-static-literal-names.js
index 8ca0cf3dc3..0b5766c6d3 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: Static literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-new-sc-line-method-string-literal-names.js b/test/language/expressions/class/fields-new-sc-line-method-string-literal-names.js
index 71af39f5ff..e48c11bbd0 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-new-sc-line-method.template
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-computed-names.js b/test/language/expressions/class/fields-regular-definitions-computed-names.js
index 5a07b8ac3a..2cc6d56d4c 100644
--- a/test/language/expressions/class/fields-regular-definitions-computed-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: Computed property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-computed-symbol-names.js b/test/language/expressions/class/fields-regular-definitions-computed-symbol-names.js
index 7a2c8472ec..f01646bcd4 100644
--- a/test/language/expressions/class/fields-regular-definitions-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: Computed property symbol names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-literal-names.js b/test/language/expressions/class/fields-regular-definitions-literal-names.js
index b602dd3089..16f2cd297d 100644
--- a/test/language/expressions/class/fields-regular-definitions-literal-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: Literal property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-static-computed-names.js b/test/language/expressions/class/fields-regular-definitions-static-computed-names.js
index bdc8894793..561a7b7f50 100644
--- a/test/language/expressions/class/fields-regular-definitions-static-computed-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: Static Computed property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-static-computed-symbol-names.js b/test/language/expressions/class/fields-regular-definitions-static-computed-symbol-names.js
index 8b6827fb50..8b4cc347f3 100644
--- a/test/language/expressions/class/fields-regular-definitions-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: Static computed property symbol names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-static-literal-names.js b/test/language/expressions/class/fields-regular-definitions-static-literal-names.js
index f3e61ced50..c7219210e1 100644
--- a/test/language/expressions/class/fields-regular-definitions-static-literal-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: Static literal property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-regular-definitions-string-literal-names.js b/test/language/expressions/class/fields-regular-definitions-string-literal-names.js
index 15e5eeded0..6636aa21ab 100644
--- a/test/language/expressions/class/fields-regular-definitions-string-literal-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-regular-definitions.template
 /*---
 description: String literal names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-computed-names.js b/test/language/expressions/class/fields-same-line-async-gen-computed-names.js
index 35faa571ed..0755918d0f 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: Computed property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-async-gen-computed-symbol-names.js
index 6f443668d8..a02b46b4e5 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: Computed property symbol names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-literal-names.js b/test/language/expressions/class/fields-same-line-async-gen-literal-names.js
index 18ab2e7afc..c3dc382d5c 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: Literal property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-static-computed-names.js b/test/language/expressions/class/fields-same-line-async-gen-static-computed-names.js
index dd4de31ced..0f0fe55d58 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-static-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: Static Computed property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-static-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-async-gen-static-computed-symbol-names.js
index f96e1c2ad2..6b88f56e46 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: Static computed property symbol names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-static-literal-names.js b/test/language/expressions/class/fields-same-line-async-gen-static-literal-names.js
index 19a9937064..84ebcbff9c 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-static-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: Static literal property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-gen-string-literal-names.js b/test/language/expressions/class/fields-same-line-async-gen-string-literal-names.js
index 04ae2f464a..6201b2ee9f 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-string-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-gen.template
 /*---
 description: String literal names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-computed-names.js b/test/language/expressions/class/fields-same-line-async-method-computed-names.js
index ab1ab5bd8b..1cfdda5720 100644
--- a/test/language/expressions/class/fields-same-line-async-method-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: Computed property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-async-method-computed-symbol-names.js
index eed1fe63e2..c350934b08 100644
--- a/test/language/expressions/class/fields-same-line-async-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: Computed property symbol names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-literal-names.js b/test/language/expressions/class/fields-same-line-async-method-literal-names.js
index c6c30d31f2..efe14403cf 100644
--- a/test/language/expressions/class/fields-same-line-async-method-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: Literal property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-static-computed-names.js b/test/language/expressions/class/fields-same-line-async-method-static-computed-names.js
index 72bafc7271..481ba48e0f 100644
--- a/test/language/expressions/class/fields-same-line-async-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: Static Computed property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-async-method-static-computed-symbol-names.js
index 67246b85b1..7d8db59d26 100644
--- a/test/language/expressions/class/fields-same-line-async-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: Static computed property symbol names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-static-literal-names.js b/test/language/expressions/class/fields-same-line-async-method-static-literal-names.js
index 8962f92295..da30532722 100644
--- a/test/language/expressions/class/fields-same-line-async-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: Static literal property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-async-method-string-literal-names.js b/test/language/expressions/class/fields-same-line-async-method-string-literal-names.js
index 9913779893..30ed0aac6b 100644
--- a/test/language/expressions/class/fields-same-line-async-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-after-same-line-async-method.template
 /*---
 description: String literal names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-computed-names.js b/test/language/expressions/class/fields-same-line-gen-computed-names.js
index 19821fef58..2b0fba7c56 100644
--- a/test/language/expressions/class/fields-same-line-gen-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: Computed property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-gen-computed-symbol-names.js
index 61d3557fd7..f6ea225438 100644
--- a/test/language/expressions/class/fields-same-line-gen-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: Computed property symbol names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-literal-names.js b/test/language/expressions/class/fields-same-line-gen-literal-names.js
index 248d4b9f63..39da637603 100644
--- a/test/language/expressions/class/fields-same-line-gen-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: Literal property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-static-computed-names.js b/test/language/expressions/class/fields-same-line-gen-static-computed-names.js
index 71a36cc15a..cb38eb406c 100644
--- a/test/language/expressions/class/fields-same-line-gen-static-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: Static Computed property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-static-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-gen-static-computed-symbol-names.js
index 11c793da01..46ca7a8c17 100644
--- a/test/language/expressions/class/fields-same-line-gen-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: Static computed property symbol names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-static-literal-names.js b/test/language/expressions/class/fields-same-line-gen-static-literal-names.js
index 3bb9290762..dc13ee4b80 100644
--- a/test/language/expressions/class/fields-same-line-gen-static-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: Static literal property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-gen-string-literal-names.js b/test/language/expressions/class/fields-same-line-gen-string-literal-names.js
index 74fe1e446a..8f6e5c4b71 100644
--- a/test/language/expressions/class/fields-same-line-gen-string-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-generator.template
 /*---
 description: String literal names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-computed-names.js b/test/language/expressions/class/fields-same-line-method-computed-names.js
index 465cd9b671..8faaddf426 100644
--- a/test/language/expressions/class/fields-same-line-method-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: Computed property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-method-computed-symbol-names.js
index 11d2a550f2..3a3bd34f80 100644
--- a/test/language/expressions/class/fields-same-line-method-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-literal-names.js b/test/language/expressions/class/fields-same-line-method-literal-names.js
index 9fbb56871e..ee77250026 100644
--- a/test/language/expressions/class/fields-same-line-method-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: Literal property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-static-computed-names.js b/test/language/expressions/class/fields-same-line-method-static-computed-names.js
index af28adedf5..8e3cd8f51f 100644
--- a/test/language/expressions/class/fields-same-line-method-static-computed-names.js
+++ b/test/language/expressions/class/fields-same-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: Static Computed property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-static-computed-symbol-names.js b/test/language/expressions/class/fields-same-line-method-static-computed-symbol-names.js
index 3bc08250f9..09083ff8af 100644
--- a/test/language/expressions/class/fields-same-line-method-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-same-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-static-literal-names.js b/test/language/expressions/class/fields-same-line-method-static-literal-names.js
index cf2491ff03..0f579bca90 100644
--- a/test/language/expressions/class/fields-same-line-method-static-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: Static literal property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-same-line-method-string-literal-names.js b/test/language/expressions/class/fields-same-line-method-string-literal-names.js
index b337a6f15f..3f39a6c021 100644
--- a/test/language/expressions/class/fields-same-line-method-string-literal-names.js
+++ b/test/language/expressions/class/fields-same-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-same-line-method.template
 /*---
 description: String literal names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-computed-names.js b/test/language/expressions/class/fields-wrapped-in-sc-computed-names.js
index 6a0d23c75c..51fdf456a6 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-computed-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: Computed property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-computed-symbol-names.js b/test/language/expressions/class/fields-wrapped-in-sc-computed-symbol-names.js
index 27c1ea48be..b678529926 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: Computed property symbol names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-literal-names.js b/test/language/expressions/class/fields-wrapped-in-sc-literal-names.js
index 15f4274771..7a5080a738 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-literal-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: Literal property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-static-computed-names.js b/test/language/expressions/class/fields-wrapped-in-sc-static-computed-names.js
index 5c872a66a5..34025f9b2e 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-static-computed-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: Static Computed property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-static-computed-symbol-names.js b/test/language/expressions/class/fields-wrapped-in-sc-static-computed-symbol-names.js
index b13c40f717..b8fb78a25a 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-static-computed-symbol-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: Static computed property symbol names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-static-literal-names.js b/test/language/expressions/class/fields-wrapped-in-sc-static-literal-names.js
index abb9d37ae9..89167a3746 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-static-literal-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: Static literal property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-string-literal-names.js b/test/language/expressions/class/fields-wrapped-in-sc-string-literal-names.js
index 180704ff6b..da2af62bb4 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-string-literal-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-expr-wrapped-in-sc.template
 /*---
 description: String literal names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-computed-names.js b/test/language/statements/class/fields-after-same-line-gen-computed-names.js
index 09acb20db4..5242f5e1be 100644
--- a/test/language/statements/class/fields-after-same-line-gen-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: Computed property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-gen-computed-symbol-names.js
index e8cfaacbd3..da03a0a6c3 100644
--- a/test/language/statements/class/fields-after-same-line-gen-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: Computed property symbol names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-literal-names.js b/test/language/statements/class/fields-after-same-line-gen-literal-names.js
index e087a50dd9..5a0bb6721a 100644
--- a/test/language/statements/class/fields-after-same-line-gen-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: Literal property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-static-computed-names.js b/test/language/statements/class/fields-after-same-line-gen-static-computed-names.js
index 99d3f1d449..3f78521bf5 100644
--- a/test/language/statements/class/fields-after-same-line-gen-static-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: Static Computed property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-static-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-gen-static-computed-symbol-names.js
index 75771c7e4e..f008df86f1 100644
--- a/test/language/statements/class/fields-after-same-line-gen-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: Static computed property symbol names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-static-literal-names.js b/test/language/statements/class/fields-after-same-line-gen-static-literal-names.js
index e177af0599..8460f72500 100644
--- a/test/language/statements/class/fields-after-same-line-gen-static-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: Static literal property names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-gen-string-literal-names.js b/test/language/statements/class/fields-after-same-line-gen-string-literal-names.js
index 2d57de48a0..1f5f8fed63 100644
--- a/test/language/statements/class/fields-after-same-line-gen-string-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-gen.template
 /*---
 description: String literal names (field definitions after a generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-computed-names.js b/test/language/statements/class/fields-after-same-line-method-computed-names.js
index 57cab968c7..6933e4b941 100644
--- a/test/language/statements/class/fields-after-same-line-method-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: Computed property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-method-computed-symbol-names.js
index 16f3a6a706..129f49c98d 100644
--- a/test/language/statements/class/fields-after-same-line-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: Computed property symbol names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-literal-names.js b/test/language/statements/class/fields-after-same-line-method-literal-names.js
index 72df50dbd8..a0facfffdb 100644
--- a/test/language/statements/class/fields-after-same-line-method-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: Literal property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-static-computed-names.js b/test/language/statements/class/fields-after-same-line-method-static-computed-names.js
index e264f1823f..7c454d2ba9 100644
--- a/test/language/statements/class/fields-after-same-line-method-static-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: Static Computed property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-static-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-method-static-computed-symbol-names.js
index 6e6203ee75..d529c257ed 100644
--- a/test/language/statements/class/fields-after-same-line-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: Static computed property symbol names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-static-literal-names.js b/test/language/statements/class/fields-after-same-line-method-static-literal-names.js
index eccff1ad1f..5f63b572fd 100644
--- a/test/language/statements/class/fields-after-same-line-method-static-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: Static literal property names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-method-string-literal-names.js b/test/language/statements/class/fields-after-same-line-method-string-literal-names.js
index e79c290e0b..c6222fa49f 100644
--- a/test/language/statements/class/fields-after-same-line-method-string-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-method.template
 /*---
 description: String literal names (field definitions after a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-computed-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-computed-names.js
index e3633f357d..41e3e93104 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: Computed property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-computed-symbol-names.js
index 99e5cd894a..468e2b35d5 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: Computed property symbol names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-literal-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-literal-names.js
index fbad9e08e6..5ce9a6054d 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: Literal property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-names.js
index 7b79201486..09427e35e2 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: Static Computed property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js
index de1b631077..7b90798bb3 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: Static computed property symbol names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-static-literal-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-static-literal-names.js
index e50ec23d7a..e72e69a3f3 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-static-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: Static literal property names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-string-literal-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-string-literal-names.js
index a9723d07a4..7b698a4528 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-string-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
 /*---
 description: String literal names (field definitions after a static async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-computed-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-computed-names.js
index 83d150da06..44fa754faa 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: Computed property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-computed-symbol-names.js
index 454d57bf67..ebc558f7ee 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: Computed property symbol names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-literal-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-literal-names.js
index 1a58bf8fde..daa3eb6f39 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: Literal property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-names.js
index 4de996cfd6..074733ef00 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: Static Computed property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js
index d1ab23213d..dccfeccbca 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: Static computed property symbol names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-static-literal-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-static-literal-names.js
index c8112059c5..797d3f3449 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-static-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: Static literal property names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-string-literal-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-string-literal-names.js
index 1815250905..e78203eb90 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-string-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-async-method.template
 /*---
 description: String literal names (field definitions after a static async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-computed-names.js b/test/language/statements/class/fields-after-same-line-static-gen-computed-names.js
index 70afd6a1aa..50db86451f 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: Computed property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-gen-computed-symbol-names.js
index a412f992d9..ca2cfffdd0 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: Computed property symbol names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-literal-names.js b/test/language/statements/class/fields-after-same-line-static-gen-literal-names.js
index 2c21f47baa..cf17e12232 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: Literal property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-static-computed-names.js b/test/language/statements/class/fields-after-same-line-static-gen-static-computed-names.js
index 47ddb34eab..c980dfbe2f 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-static-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: Static Computed property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-static-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-gen-static-computed-symbol-names.js
index 635c9a0767..b473776ed2 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: Static computed property symbol names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-static-literal-names.js b/test/language/statements/class/fields-after-same-line-static-gen-static-literal-names.js
index 677321c281..4270e397ad 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-static-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: Static literal property names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-string-literal-names.js b/test/language/statements/class/fields-after-same-line-static-gen-string-literal-names.js
index f38b7b7545..015987d588 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-string-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-gen.template
 /*---
 description: String literal names (field definitions after a static generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-computed-names.js b/test/language/statements/class/fields-after-same-line-static-method-computed-names.js
index cb759fe52d..53b8e3bb5d 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: Computed property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-method-computed-symbol-names.js
index ccf3fb18ea..bab33bb165 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: Computed property symbol names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-literal-names.js b/test/language/statements/class/fields-after-same-line-static-method-literal-names.js
index 9436b0ab13..8cf005134e 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: Literal property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-static-computed-names.js b/test/language/statements/class/fields-after-same-line-static-method-static-computed-names.js
index 9f62592b35..4b196c0a41 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-static-computed-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: Static Computed property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-static-computed-symbol-names.js b/test/language/statements/class/fields-after-same-line-static-method-static-computed-symbol-names.js
index 077a7ff89b..153d0320b3 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: Static computed property symbol names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-static-literal-names.js b/test/language/statements/class/fields-after-same-line-static-method-static-literal-names.js
index ea40041ffc..43341468bd 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-static-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: Static literal property names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-after-same-line-static-method-string-literal-names.js b/test/language/statements/class/fields-after-same-line-static-method-string-literal-names.js
index abcd24faf4..0e4a59e6af 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-string-literal-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-static-method.template
 /*---
 description: String literal names (field definitions after a static method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-computed-names.js b/test/language/statements/class/fields-multiple-definitions-computed-names.js
index 19a0cb3af0..8c15af84f4 100644
--- a/test/language/statements/class/fields-multiple-definitions-computed-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: Computed property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-computed-symbol-names.js b/test/language/statements/class/fields-multiple-definitions-computed-symbol-names.js
index c6df1b5540..28f0a8845b 100644
--- a/test/language/statements/class/fields-multiple-definitions-computed-symbol-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: Computed property symbol names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-literal-names.js b/test/language/statements/class/fields-multiple-definitions-literal-names.js
index 2ae740ab84..de483bfa22 100644
--- a/test/language/statements/class/fields-multiple-definitions-literal-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: Literal property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-static-computed-names.js b/test/language/statements/class/fields-multiple-definitions-static-computed-names.js
index 97a27c94c0..09293f69f0 100644
--- a/test/language/statements/class/fields-multiple-definitions-static-computed-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: Static Computed property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-static-computed-symbol-names.js b/test/language/statements/class/fields-multiple-definitions-static-computed-symbol-names.js
index 93268a2769..b0d336fdfd 100644
--- a/test/language/statements/class/fields-multiple-definitions-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: Static computed property symbol names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-static-literal-names.js b/test/language/statements/class/fields-multiple-definitions-static-literal-names.js
index 7dd36a89f6..672f36cd14 100644
--- a/test/language/statements/class/fields-multiple-definitions-static-literal-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: Static literal property names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-definitions-string-literal-names.js b/test/language/statements/class/fields-multiple-definitions-string-literal-names.js
index b4cf0ca7b8..0bdc197481 100644
--- a/test/language/statements/class/fields-multiple-definitions-string-literal-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-definitions.template
 /*---
 description: String literal names (multiple fields definitions)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-computed-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-computed-names.js
index dde07e8b29..e84d859b83 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-computed-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: Computed property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-computed-symbol-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-computed-symbol-names.js
index ea00d956e7..a829009a15 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-computed-symbol-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: Computed property symbol names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-literal-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-literal-names.js
index 2e2019c596..8992888f6a 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-literal-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: Literal property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-names.js
index 766e1f8b31..7cf2fe2717 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: Static Computed property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js
index a90a3a747d..d41baa279f 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: Static computed property symbol names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-static-literal-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-static-literal-names.js
index c6749a97b3..906c3f943b 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-static-literal-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: Static literal property names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-string-literal-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-string-literal-names.js
index a7560047a4..fb77541047 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-string-literal-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-multiple-stacked-definitions.template
 /*---
 description: String literal names (multiple stacked fields definitions through ASI)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-computed-names.js b/test/language/statements/class/fields-new-no-sc-line-method-computed-names.js
index 3ed70dc828..013601d880 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-computed-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: Computed property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-computed-symbol-names.js b/test/language/statements/class/fields-new-no-sc-line-method-computed-symbol-names.js
index 006a80a5f3..b35333bea1 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-literal-names.js b/test/language/statements/class/fields-new-no-sc-line-method-literal-names.js
index ab88001d64..0f81ff3861 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-literal-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: Literal property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-static-computed-names.js b/test/language/statements/class/fields-new-no-sc-line-method-static-computed-names.js
index 14ba9e812b..d6e4ea3793 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-static-computed-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: Static Computed property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-static-computed-symbol-names.js b/test/language/statements/class/fields-new-no-sc-line-method-static-computed-symbol-names.js
index 925379c474..ef9cd465e7 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-static-literal-names.js b/test/language/statements/class/fields-new-no-sc-line-method-static-literal-names.js
index f587d2b001..8bd683b9c1 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-static-literal-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: Static literal property names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-string-literal-names.js b/test/language/statements/class/fields-new-no-sc-line-method-string-literal-names.js
index f32d2fb8fb..f653063e9e 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-string-literal-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-no-sc-line-method.template
 /*---
 description: String literal names (field definitions followed by a method in a new line without a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-computed-names.js b/test/language/statements/class/fields-new-sc-line-gen-computed-names.js
index e0843abe43..25d735e9f6 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-computed-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-computed-symbol-names.js b/test/language/statements/class/fields-new-sc-line-gen-computed-symbol-names.js
index dbb97b58e5..771e1f1761 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-computed-symbol-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-literal-names.js b/test/language/statements/class/fields-new-sc-line-gen-literal-names.js
index ba61d87760..9a645cb45d 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-literal-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-static-computed-names.js b/test/language/statements/class/fields-new-sc-line-gen-static-computed-names.js
index 7736f5f283..fd4c046dfe 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-static-computed-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: Static Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-static-computed-symbol-names.js b/test/language/statements/class/fields-new-sc-line-gen-static-computed-symbol-names.js
index 7e9ed072b2..d965b31d0a 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-static-literal-names.js b/test/language/statements/class/fields-new-sc-line-gen-static-literal-names.js
index 0857061292..58b5cbb20c 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-static-literal-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: Static literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-gen-string-literal-names.js b/test/language/statements/class/fields-new-sc-line-gen-string-literal-names.js
index 3af49c3e73..79a7607ab6 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-string-literal-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-generator.template
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-computed-names.js b/test/language/statements/class/fields-new-sc-line-method-computed-names.js
index 068460510b..d7403fd735 100644
--- a/test/language/statements/class/fields-new-sc-line-method-computed-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-computed-symbol-names.js b/test/language/statements/class/fields-new-sc-line-method-computed-symbol-names.js
index 501a9c455f..bb1a24b314 100644
--- a/test/language/statements/class/fields-new-sc-line-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-literal-names.js b/test/language/statements/class/fields-new-sc-line-method-literal-names.js
index 24ce2a6b41..7d23f42bb3 100644
--- a/test/language/statements/class/fields-new-sc-line-method-literal-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-static-computed-names.js b/test/language/statements/class/fields-new-sc-line-method-static-computed-names.js
index 8c8d1f7c28..26c6d4e194 100644
--- a/test/language/statements/class/fields-new-sc-line-method-static-computed-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: Static Computed property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-static-computed-symbol-names.js b/test/language/statements/class/fields-new-sc-line-method-static-computed-symbol-names.js
index 9ad8182f2e..91b260883f 100644
--- a/test/language/statements/class/fields-new-sc-line-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-static-literal-names.js b/test/language/statements/class/fields-new-sc-line-method-static-literal-names.js
index db60f6da21..f86f7da7ab 100644
--- a/test/language/statements/class/fields-new-sc-line-method-static-literal-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: Static literal property names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-new-sc-line-method-string-literal-names.js b/test/language/statements/class/fields-new-sc-line-method-string-literal-names.js
index e7ec07376b..713991137e 100644
--- a/test/language/statements/class/fields-new-sc-line-method-string-literal-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-new-sc-line-method.template
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-computed-names.js b/test/language/statements/class/fields-regular-definitions-computed-names.js
index bdb9526756..331ef29084 100644
--- a/test/language/statements/class/fields-regular-definitions-computed-names.js
+++ b/test/language/statements/class/fields-regular-definitions-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: Computed property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-computed-symbol-names.js b/test/language/statements/class/fields-regular-definitions-computed-symbol-names.js
index 1d05dd7142..8ad7d54095 100644
--- a/test/language/statements/class/fields-regular-definitions-computed-symbol-names.js
+++ b/test/language/statements/class/fields-regular-definitions-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: Computed property symbol names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-literal-names.js b/test/language/statements/class/fields-regular-definitions-literal-names.js
index b35f3cc138..f4710fd7bd 100644
--- a/test/language/statements/class/fields-regular-definitions-literal-names.js
+++ b/test/language/statements/class/fields-regular-definitions-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: Literal property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-static-computed-names.js b/test/language/statements/class/fields-regular-definitions-static-computed-names.js
index b61ca08f90..bad49f1af3 100644
--- a/test/language/statements/class/fields-regular-definitions-static-computed-names.js
+++ b/test/language/statements/class/fields-regular-definitions-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: Static Computed property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-static-computed-symbol-names.js b/test/language/statements/class/fields-regular-definitions-static-computed-symbol-names.js
index e982efc9ab..a713299d5f 100644
--- a/test/language/statements/class/fields-regular-definitions-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-regular-definitions-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: Static computed property symbol names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-static-literal-names.js b/test/language/statements/class/fields-regular-definitions-static-literal-names.js
index 4ebbcedef8..d032244bb4 100644
--- a/test/language/statements/class/fields-regular-definitions-static-literal-names.js
+++ b/test/language/statements/class/fields-regular-definitions-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: Static literal property names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-regular-definitions-string-literal-names.js b/test/language/statements/class/fields-regular-definitions-string-literal-names.js
index 1b94eced59..f56f41323b 100644
--- a/test/language/statements/class/fields-regular-definitions-string-literal-names.js
+++ b/test/language/statements/class/fields-regular-definitions-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-regular-definitions.template
 /*---
 description: String literal names (regular fields defintion)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-computed-names.js b/test/language/statements/class/fields-same-line-async-gen-computed-names.js
index 36e849a3ac..0f7c38f1b3 100644
--- a/test/language/statements/class/fields-same-line-async-gen-computed-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: Computed property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-computed-symbol-names.js b/test/language/statements/class/fields-same-line-async-gen-computed-symbol-names.js
index 6b5438594f..a228b84037 100644
--- a/test/language/statements/class/fields-same-line-async-gen-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: Computed property symbol names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-literal-names.js b/test/language/statements/class/fields-same-line-async-gen-literal-names.js
index b53f1eb39e..166b2d15b0 100644
--- a/test/language/statements/class/fields-same-line-async-gen-literal-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: Literal property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-static-computed-names.js b/test/language/statements/class/fields-same-line-async-gen-static-computed-names.js
index 36cc96868d..f324abb96f 100644
--- a/test/language/statements/class/fields-same-line-async-gen-static-computed-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: Static Computed property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-static-computed-symbol-names.js b/test/language/statements/class/fields-same-line-async-gen-static-computed-symbol-names.js
index 19ef041227..f674c4e163 100644
--- a/test/language/statements/class/fields-same-line-async-gen-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: Static computed property symbol names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-static-literal-names.js b/test/language/statements/class/fields-same-line-async-gen-static-literal-names.js
index 43f38752c8..4bca5f27a4 100644
--- a/test/language/statements/class/fields-same-line-async-gen-static-literal-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: Static literal property names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-gen-string-literal-names.js b/test/language/statements/class/fields-same-line-async-gen-string-literal-names.js
index 37786f7fda..7c01efaea3 100644
--- a/test/language/statements/class/fields-same-line-async-gen-string-literal-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-gen.template
 /*---
 description: String literal names (field definitions after an async generator in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-computed-names.js b/test/language/statements/class/fields-same-line-async-method-computed-names.js
index 6f4bde6798..68e037e005 100644
--- a/test/language/statements/class/fields-same-line-async-method-computed-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: Computed property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-computed-symbol-names.js b/test/language/statements/class/fields-same-line-async-method-computed-symbol-names.js
index 10b9a55114..4f02dbe52d 100644
--- a/test/language/statements/class/fields-same-line-async-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: Computed property symbol names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-literal-names.js b/test/language/statements/class/fields-same-line-async-method-literal-names.js
index 7c1a009b46..67536a51a3 100644
--- a/test/language/statements/class/fields-same-line-async-method-literal-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: Literal property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-static-computed-names.js b/test/language/statements/class/fields-same-line-async-method-static-computed-names.js
index ee88f33e7b..0b472e348c 100644
--- a/test/language/statements/class/fields-same-line-async-method-static-computed-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: Static Computed property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-static-computed-symbol-names.js b/test/language/statements/class/fields-same-line-async-method-static-computed-symbol-names.js
index 0e3cb44619..230544aa56 100644
--- a/test/language/statements/class/fields-same-line-async-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: Static computed property symbol names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-static-literal-names.js b/test/language/statements/class/fields-same-line-async-method-static-literal-names.js
index 631504b9b3..cecaa9bf0a 100644
--- a/test/language/statements/class/fields-same-line-async-method-static-literal-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: Static literal property names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-async-method-string-literal-names.js b/test/language/statements/class/fields-same-line-async-method-string-literal-names.js
index 5fa7293986..c3415ec925 100644
--- a/test/language/statements/class/fields-same-line-async-method-string-literal-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-after-same-line-async-method.template
 /*---
 description: String literal names (field definitions after an async method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-computed-names.js b/test/language/statements/class/fields-same-line-gen-computed-names.js
index 8c1a36923b..7ce2a5a0c7 100644
--- a/test/language/statements/class/fields-same-line-gen-computed-names.js
+++ b/test/language/statements/class/fields-same-line-gen-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: Computed property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-computed-symbol-names.js b/test/language/statements/class/fields-same-line-gen-computed-symbol-names.js
index a7976b9916..ac8092d5bf 100644
--- a/test/language/statements/class/fields-same-line-gen-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-gen-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: Computed property symbol names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-literal-names.js b/test/language/statements/class/fields-same-line-gen-literal-names.js
index d84b1c3ce9..689e9cb256 100644
--- a/test/language/statements/class/fields-same-line-gen-literal-names.js
+++ b/test/language/statements/class/fields-same-line-gen-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: Literal property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-static-computed-names.js b/test/language/statements/class/fields-same-line-gen-static-computed-names.js
index 158a1aa43f..6544e21aee 100644
--- a/test/language/statements/class/fields-same-line-gen-static-computed-names.js
+++ b/test/language/statements/class/fields-same-line-gen-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: Static Computed property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-static-computed-symbol-names.js b/test/language/statements/class/fields-same-line-gen-static-computed-symbol-names.js
index 52699d5ecc..ec324d8356 100644
--- a/test/language/statements/class/fields-same-line-gen-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-gen-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: Static computed property symbol names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-static-literal-names.js b/test/language/statements/class/fields-same-line-gen-static-literal-names.js
index 7afdf30af8..0a624e21c2 100644
--- a/test/language/statements/class/fields-same-line-gen-static-literal-names.js
+++ b/test/language/statements/class/fields-same-line-gen-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: Static literal property names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-gen-string-literal-names.js b/test/language/statements/class/fields-same-line-gen-string-literal-names.js
index 9f78333a3b..5eb4b49120 100644
--- a/test/language/statements/class/fields-same-line-gen-string-literal-names.js
+++ b/test/language/statements/class/fields-same-line-gen-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-generator.template
 /*---
 description: String literal names (field definitions followed by a generator method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields, generators]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-computed-names.js b/test/language/statements/class/fields-same-line-method-computed-names.js
index 4a9ae59e11..a94d95379a 100644
--- a/test/language/statements/class/fields-same-line-method-computed-names.js
+++ b/test/language/statements/class/fields-same-line-method-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: Computed property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-computed-symbol-names.js b/test/language/statements/class/fields-same-line-method-computed-symbol-names.js
index 2e3aac2b2a..e8ca9aa779 100644
--- a/test/language/statements/class/fields-same-line-method-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-method-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: Computed property symbol names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-literal-names.js b/test/language/statements/class/fields-same-line-method-literal-names.js
index 377d6f8dcc..35f339943e 100644
--- a/test/language/statements/class/fields-same-line-method-literal-names.js
+++ b/test/language/statements/class/fields-same-line-method-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: Literal property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-static-computed-names.js b/test/language/statements/class/fields-same-line-method-static-computed-names.js
index 0b8076d624..7e0cf4ba85 100644
--- a/test/language/statements/class/fields-same-line-method-static-computed-names.js
+++ b/test/language/statements/class/fields-same-line-method-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: Static Computed property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-static-computed-symbol-names.js b/test/language/statements/class/fields-same-line-method-static-computed-symbol-names.js
index d7175fb6a9..1f8cb7ae89 100644
--- a/test/language/statements/class/fields-same-line-method-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-same-line-method-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: Static computed property symbol names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-static-literal-names.js b/test/language/statements/class/fields-same-line-method-static-literal-names.js
index 8a413a4908..adee793e19 100644
--- a/test/language/statements/class/fields-same-line-method-static-literal-names.js
+++ b/test/language/statements/class/fields-same-line-method-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: Static literal property names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-same-line-method-string-literal-names.js b/test/language/statements/class/fields-same-line-method-string-literal-names.js
index 8b47831ac0..1c7b66528e 100644
--- a/test/language/statements/class/fields-same-line-method-string-literal-names.js
+++ b/test/language/statements/class/fields-same-line-method-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-same-line-method.template
 /*---
 description: String literal names (field definitions followed by a method in the same line)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-computed-names.js b/test/language/statements/class/fields-wrapped-in-sc-computed-names.js
index 8b9c1cdf69..a4729fb8ab 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-computed-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: Computed property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-computed-symbol-names.js b/test/language/statements/class/fields-wrapped-in-sc-computed-symbol-names.js
index ef9466ace8..fc793e10cb 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-computed-symbol-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: Computed property symbol names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-literal-names.js b/test/language/statements/class/fields-wrapped-in-sc-literal-names.js
index 4212441ce8..103b0e06e7 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-literal-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: Literal property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-static-computed-names.js b/test/language/statements/class/fields-wrapped-in-sc-static-computed-names.js
index 3a569f8c33..96434be4c2 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-static-computed-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-static-computed-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: Static Computed property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-static-computed-symbol-names.js b/test/language/statements/class/fields-wrapped-in-sc-static-computed-symbol-names.js
index 1d7a9681da..3539cf1626 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-static-computed-symbol-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-static-computed-symbol-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: Static computed property symbol names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [Symbol, computed-property-names, class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-static-literal-names.js b/test/language/statements/class/fields-wrapped-in-sc-static-literal-names.js
index 3709f8f89f..ef8a81c6ff 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-static-literal-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-static-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: Static literal property names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]
diff --git a/test/language/statements/class/fields-wrapped-in-sc-string-literal-names.js b/test/language/statements/class/fields-wrapped-in-sc-string-literal-names.js
index 7eccf5a2ef..51a4863a69 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-string-literal-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-string-literal-names.js
@@ -3,6 +3,7 @@
 // - src/class-fields/default/cls-decl-wrapped-in-sc.template
 /*---
 description: String literal names (fields definition wrapped in semicolons)
+esid: prod-FieldDefinition
 features: [class-fields]
 flags: [generated]
 includes: [propertyHelper.js]