diff --git a/test/language/expressions/class/err-field-delete-call-expression-privatename.js b/test/language/expressions/class/err-field-delete-call-expression-privatename.js
index 5941f1b87f4c0b9c5e68abb377047ee85e898876..ca9713f246a97777fc67be007066cea85c8b0220 100644
--- a/test/language/expressions/class/err-field-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in field)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-field-delete-covered-call-expression-privatename.js b/test/language/expressions/class/err-field-delete-covered-call-expression-privatename.js
index 2709caa8148c088917a614405c4f9eb9f7926cf5..1f8f33f5547aacc7075a4d67442cd3e464cb392b 100644
--- a/test/language/expressions/class/err-field-delete-covered-call-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in field, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-field-delete-covered-member-expression-privatename.js b/test/language/expressions/class/err-field-delete-covered-member-expression-privatename.js
index 84e557e6223d5dd6cd3d0487f16e893a4309a9f1..ee592c39a273f713d67a89af552a3c5aa1c79535 100644
--- a/test/language/expressions/class/err-field-delete-covered-member-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in field, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-field-delete-member-expression-privatename.js b/test/language/expressions/class/err-field-delete-member-expression-privatename.js
index 6e8381e2214c23503dcef176ca325aba27fc1a56..a3054ee411340c5e623737a2078e8cec20e984d4 100644
--- a/test/language/expressions/class/err-field-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in field)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-call-expression-privatename.js b/test/language/expressions/class/err-field-delete-twice-covered-call-expression-privatename.js
index ccc0f4f17254067d5cd3444023631b0525f82e97..d80e46124922a5db593561acc0d75539bff4b9cc 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-call-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in field, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-member-expression-privatename.js b/test/language/expressions/class/err-field-delete-twice-covered-member-expression-privatename.js
index c170745c4fe4ae91e79e4e0398bdeb0dee205aa4..952a163e6563302596ea3ac7010d3d415d122c5b 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-member-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in field, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-method-delete-call-expression-privatename.js b/test/language/expressions/class/err-method-delete-call-expression-privatename.js
index ad7390815c0156c57ca07bd069f788d9403ccb0d..2967855ec1ef0acc95120ab46595fc7413013642 100644
--- a/test/language/expressions/class/err-method-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in method)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-method-delete-covered-call-expression-privatename.js b/test/language/expressions/class/err-method-delete-covered-call-expression-privatename.js
index 3b85fdf5f48b2b311be002ffb37b5b54ebd56982..a3d193cdc3d2d522f9ad0f34648c9e2b2e2a0e19 100644
--- a/test/language/expressions/class/err-method-delete-covered-call-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in method, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-method-delete-covered-member-expression-privatename.js b/test/language/expressions/class/err-method-delete-covered-member-expression-privatename.js
index ae0ef4619c6580b2b1093f1545eca39cdb054858..2f9a2b2fd274ab47697cc12d4f5bd902b6b34c86 100644
--- a/test/language/expressions/class/err-method-delete-covered-member-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in method, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-method-delete-member-expression-privatename.js b/test/language/expressions/class/err-method-delete-member-expression-privatename.js
index 5ac00be8820eba0d816ddbd52488f95ee336b189..7c2b524737dbd31a5111c1e493b752ce057847e7 100644
--- a/test/language/expressions/class/err-method-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in method)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-call-expression-privatename.js b/test/language/expressions/class/err-method-delete-twice-covered-call-expression-privatename.js
index 02aa7e63dc12b887185a971ac1c8afe0d4125591..881106a27cc4e82e76e5a7a7aa848cd0928ed60b 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-call-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in method, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-member-expression-privatename.js b/test/language/expressions/class/err-method-delete-twice-covered-member-expression-privatename.js
index 6ca6f29abebf027759c3a698cc4a3e4b7264c207..fd5ff6e57fa2e7dc63ddea7298cebead7e7525f3 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-member-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in method, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
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 9e58a6259e9d630f121569c8cfd0d6e29a258c07..276f5ea3ecf1c49baecf75e1f69dfa5b8827a325 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 780844d06f37e51213752521bd2d9a2d04b2588a..ca449cf30321235f2c1d2b6335e8f3bad2912610 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 301c70b2b02de86bfce5d6f53e3c7b915f0bf4fc..cf1622749660a6d0ad211a210bd2e1ec81188293 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-gen-private-names.js b/test/language/expressions/class/fields-after-same-line-gen-private-names.js
index 26556aa6b380a759a421a4945ad7333037dad0fb..e730657f11eab2e4667016d574f82bacd1c8f054 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a9634a241d142a866f34a575ae144f7ee870568c..d4eb5d94a56757e5200e807b7515833ee0108e88 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 8e6670f833693d29a3db4090f4468c8e0364d00c..434717683a99a6a30b5ce014ce8c888080660701 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 5d6c2150d7da923d3c676b27c7e096509b8e09e6..385c526537650c4715a0f75d0d7671130bb4f44e 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-gen-static-private-names.js b/test/language/expressions/class/fields-after-same-line-gen-static-private-names.js
index 9dc9e66e471f70a1a904021cd406e52d2407d941..5264b5e10522589f2cb6d9bd4b67dc49c1538cef 100644
--- a/test/language/expressions/class/fields-after-same-line-gen-static-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d13199303fabf5f1254a35339e915e0a3ef59351..fbec9434025e11d461dea6225b4ba76f6abaa2a0 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 05634a09a40bed77340db61182c7406d82fc1fe6..3cf693950be959e408cd2ab34d84edc69b2ced58 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6c80a4ce8bfa36d057741504f07f0dbd0fba985a..81e5ca2a2334c5cc1c46fd9d5d459c63a5aa1729 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 3a4c92e8cdf5ed07bfa74b0b2322437634f8e079..542488ff923cd6b58e02e349c8af5996317aa4fe 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-method-private-names.js b/test/language/expressions/class/fields-after-same-line-method-private-names.js
index e2228f86d813b6af05d682e169c17e6f70a24609..145f1398d30367f02d9c8093654cde499eb3a7b6 100644
--- a/test/language/expressions/class/fields-after-same-line-method-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 9e0748052098ef8016ab06359a3cc77f068ce0e3..c9e4909fc923c4393da8fb1a12a5b44956577586 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 cb2a0b8cbe08b5830e1298c302e959602761a9d2..ff9639338ded3e099dea70b6db3fe74ee959877c 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a949cb78a822735e6fbe4c6d1f1ba6a78a1aaea7..11fd3d4eb27c9bf3400d9fb06d8868c1b27be40e 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-method-static-private-names.js b/test/language/expressions/class/fields-after-same-line-method-static-private-names.js
index 1be5b29063aba91bb02f06623466ac5a861840b1..a8e2ec2833910445c01d37d43a1807218143dc51 100644
--- a/test/language/expressions/class/fields-after-same-line-method-static-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 e87822259f4e59f4e457c1286585ab4f526e7669..bc534cb4b9ba6887e9f537cfe5190d09d2b5e87d 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 24c474d7d259955ce077193a9c14ddf4b74c76ce..e6c23736e82c7bb2854bb62a2f7f5348a08480c2 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 f70583c970f4ec65dbf8e461be3c840092bb002d..2ea39e9b6be3697b77f009f1a62df53a8a5c30eb 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 4869de13199b7f3fa71604817b7ffb3a6cf29272..e4ebb76d4b743459310260a1733691bd1a443d4c 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-private-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-private-names.js
index f861963cfc351b3b9735927f6f9f464740e60be5..167504e93f4a8f8ba60dffaf396ef837fed68dbe 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 12a2fc26e2f8d393058b415a3dbd68f0f93f0e12..ed5ebb9125eb2bf40422d6b7d2ee40f7f1b8a990 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 6417868e8b6d13e4502d4eaae858b979a8b00432..f14ea7dc83544dc60bbdabe15e2d9dd3b9c3e9af 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 1c83c9d8c8a60bad1feafc282399babfe90d38a0..c536ba476091b3998cbbbfa2a018400701857501 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-private-names.js b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-private-names.js
index dea4c29d001d0dce5d4c802848403e910ffd34e6..7d535ac73f2825eef834492c511d89aedf89801e 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-gen-static-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 abfec6f6335d36db936a0e14e24d1d80659337cc..464838a511c825435bef3e8d85b7269520280806 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 eb3b3bc6e5d064c7f18f4cda70483d66df538de1..8788d21cd69508c8166308dcc6b06346af130503 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 2dc049dfad963185ac97475aa4efa6bc905a0fc2..dd0650e0e8ad97af44f4a33af13662423dce0b57 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 b7bd95df0ee64464b500a692ba179c81ec0cea50..1e1af3d4dcfb7a39c7562f344ba7e238c7ce38ad 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-private-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-private-names.js
index 980aaeb44d5f61fd32996b424fe58dde4c543061..df6dd1aeb771f5adbb19a306cb45065193738085 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 e6bd13e379a319bd32d9fba7ba594f5de33431ba..9eeea582748253c2ac05f7a37f90032361ad82a8 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 fdab32bf2862ce017015de53b4887100f137c155..3b0d1ff8627d1eca6224a164df65b66cff07fc89 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 df0d6c0b5dae8c7577a715822efe5aea4f46faf6..b75f15606303b5d66133a0204566ca9a791eb75a 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-async-method-static-private-names.js b/test/language/expressions/class/fields-after-same-line-static-async-method-static-private-names.js
index d89783732312cfd49ab1109f3bca8589574a66e5..5efb076bfeddb1ae764d05f2d8019928ecb752ac 100644
--- a/test/language/expressions/class/fields-after-same-line-static-async-method-static-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-async-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 7c5b9b4feb8a59192316a44ba5d69c3c2b9d79fc..25ce5be1f2f42b44b59bbcae64685c341ba46c94 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 ea238f8c432f1cc7ddbf880c8e24eee1ffca8ca1..90cb11590631e3da27b67c8cb34f5257dfaa74d8 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a999bd70db58718bed8181f72522d9d0704fc8d2..6aec78a03d824902ee1255d98e40f22143d6f8a9 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 58a549929a5274fdb571638c9ce704df028b71ed..2ba95a6f1464e708ee96ba33333817e792e11484 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-private-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-private-names.js
index 6fc4f7f0af93d2ea0ba9f0cb7d0c347d302d427d..5883a5abc05ab198db7cadd229f52bc20d6dc71d 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b1a0840c1870cae858577a6cfaca68b6d54d8ded..d16244fc58cf5f1a8489ddf41d455dd7e199863c 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 f2e39fc7ae660f6c6422046d50eeeb6eea892513..40e7e890148798a4de519f130a2a64abbf920d4a 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 04ae3ddd3ed64f17116521ac8554e4e1c81db054..68d70716ddcea5a2513b2afa777f3d6551f4913d 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-gen-static-private-names.js b/test/language/expressions/class/fields-after-same-line-static-gen-static-private-names.js
index bfbe8f01d4de8c48790287efdb3f2bbc1bb741f6..03c13aff6a63b79536d2145503822c9afffbf8b8 100644
--- a/test/language/expressions/class/fields-after-same-line-static-gen-static-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 5d85381c859dc2a5f486e88ad533db81520bded7..1b8364227247f005482034602373a80ee7b22221 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 4adfb5fa081a1abe3f35f9295dbe9da52563204d..14055957b6ea28f407cd3e819d8ecbdc3d32aa4c 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 5f513203c1e93f492e4b055e0b2ceb9e5511636f..82f3a4eaedf68b225a60aaaf8907b5f6276522a1 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 cc9905b8e5c9440a91f1752a25da66cded822e0c..59a4c9c35407416a93cb3db286a2e4730c0b08e0 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-private-names.js b/test/language/expressions/class/fields-after-same-line-static-method-private-names.js
index 124c47cbeb769b470b3c8d35b8b42444f111a317..48fe0208dd5efd85ee3e06e215b268a6e07d2a08 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 9c7e097eefb3b112f2c6cc2c4bc2e8e7ac0ff494..a7af9730f5ee8a41cabbc05cb79e9afe5295a1e9 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ba37836fe387c184b6330a28e5f72842984a3db7..5e87b7760626ccf17b84916569b243e278df9ab2 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b3a08eb916209ea037e9db7c2e6fc83b27f2cedb..49df93079280e3fa1a597200bcbf7c1b032f31dc 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-after-same-line-static-method-static-private-names.js b/test/language/expressions/class/fields-after-same-line-static-method-static-private-names.js
index 92c5a19f6643a22b012dc585e5f753496e19e973..5d189f0ee2accc046ef29d4c5e3b28023b0d113b 100644
--- a/test/language/expressions/class/fields-after-same-line-static-method-static-private-names.js
+++ b/test/language/expressions/class/fields-after-same-line-static-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 9e13601f1f86bfba3383eb588c00d908a7f584cc..d4d1e093b1b4ee06c0ace78da41898e181e70fbe 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js
index 878ab53cf7a878413e9aa703b476db5ca811a8e8..0c06b7e61a320ee1f61b198e512a1734d9a1f269 100644
--- a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js
index b746929920ded6a424c7695ebfd9106e53fea8ed..5cb1e12a1f2882320931d233912cde73bb95dd5f 100644
--- a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js
index 2b25a726c8386b9c9fcff1163660936f7e02873a..278859ea54d2c4be8b1990c52b65422e6a10f2e1 100644
--- a/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-comp-name-init-err-contains-super.js b/test/language/expressions/class/fields-comp-name-init-err-contains-super.js
index b3716d81f6b06415ecb4e9d160e5dfa1acb21171..80cabb67370b615e7580a37a977b81e87dc5c0b4 100644
--- a/test/language/expressions/class/fields-comp-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-comp-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-computed-name-propname-constructor.js b/test/language/expressions/class/fields-computed-name-propname-constructor.js
index d4fd6d12e9cb2b9b4049e0c08ead1abe9b1f5d60..0240885ef8b7e192882a27e513d81de7c3ad60d5 100644
--- a/test/language/expressions/class/fields-computed-name-propname-constructor.js
+++ b/test/language/expressions/class/fields-computed-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/expressions/class/fields-computed-name-toprimitive-symbol.js b/test/language/expressions/class/fields-computed-name-toprimitive-symbol.js
index 6798bcd380a5cc0666c1af4b681f4a94d88975ea..b5091ccf8ba45d18660424ba4ed8b35e2aecad63 100644
--- a/test/language/expressions/class/fields-computed-name-toprimitive-symbol.js
+++ b/test/language/expressions/class/fields-computed-name-toprimitive-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, Symbol, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, Symbol, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-computed-name-toprimitive.js b/test/language/expressions/class/fields-computed-name-toprimitive.js
index aa7186b426d49d45c55e27f21aa4744cd8c2e654..d31d76da0b5a62a8db885f71818c7c9c11752a62 100644
--- a/test/language/expressions/class/fields-computed-name-toprimitive.js
+++ b/test/language/expressions/class/fields-computed-name-toprimitive.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-computed-variable-name-propname-constructor.js b/test/language/expressions/class/fields-computed-variable-name-propname-constructor.js
index 5ce537a3a771e0fa0c4dc301af321b78d334827f..bceceabf9e801eec3d6b659bc2daf3961b3d5158 100644
--- a/test/language/expressions/class/fields-computed-variable-name-propname-constructor.js
+++ b/test/language/expressions/class/fields-computed-variable-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/expressions/class/fields-computed-variable-name-static-propname-constructor.js b/test/language/expressions/class/fields-computed-variable-name-static-propname-constructor.js
index 62278fa5e26d86fc75ecbc4679bde8145e573499..b0926b084c7414c841b6a6a01fd37992367f0122 100644
--- a/test/language/expressions/class/fields-computed-variable-name-static-propname-constructor.js
+++ b/test/language/expressions/class/fields-computed-variable-name-static-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: static class field forbid PropName 'constructor' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/expressions/class/fields-computed-variable-name-static-propname-prototype.js b/test/language/expressions/class/fields-computed-variable-name-static-propname-prototype.js
index 84d0bb0d4b2c59df7046356d4e9f8fe1e00b5d67..dfd2688c6154b5378475217be9090fd0a4a01916 100644
--- a/test/language/expressions/class/fields-computed-variable-name-static-propname-prototype.js
+++ b/test/language/expressions/class/fields-computed-variable-name-static-propname-prototype.js
@@ -4,7 +4,7 @@
 /*---
 description: static class fields forbid PropName 'prototype' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/expressions/class/fields-ctor-called-after-fields-init.js b/test/language/expressions/class/fields-ctor-called-after-fields-init.js
index 1f5c86afe63166085039c3d24dfbbf78fc91f567..1ea88de76cedaefb2079e7a7c8f4321ac6ba3844 100644
--- a/test/language/expressions/class/fields-ctor-called-after-fields-init.js
+++ b/test/language/expressions/class/fields-ctor-called-after-fields-init.js
@@ -4,7 +4,7 @@
 /*---
 description: The constructor method is called after the fields are initalized (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     [[Construct]] ( argumentsList, newTarget)
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
index 4eda5161c71b5c0058b5a02b25cb0b4110c2943f..b80496c694d826cbeff6ccafe9041752fd6d54e0 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()['x']` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
index a5faa2bfa666c463024ab14f1de6baba59c00ca4..e09d0a2b17692f9b1c67c9ee42217304d8cce61c 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super().x` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js
index 2b120e887c051bda5437ecda2d4466ba745e4ea9..4b4a50c00f65b297b308f3b4e09eed8f02b9398f 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
index 88d6771c5907ff1e0d493b4fcbae1c34d65575e6..72049e20d9b444223432884da7dc391bfc7ddfdd 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super.x` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
index a678d0829fda5a3ce07c1ac1c45096c54c6bb0cb..2c0c1c52a53989704326562e1c0cdf794c1d97b6 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super['x']` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
index 3359f37f772e601768b8f38045ddb6c3217c659f..325a0d040cc62b3cba266274de32cbb20098fc8d 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()['x']` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
index 2a8008219dbb282417e6c28b4070ee55570d9db7..ea36cd9ed1a69ae00fbbc446c0b0d03337e4fc80 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super().x` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
index d9a3c12a12cc08f8dae4c7b2c9052264799d0be0..2bb1d7f2ab09746853178ff533368fc23ef260c1 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
index f49c5f74384c7b8f66c75a90c8aa4f9ab923fab7..36bf98e3e982acdde134b0e4fec950a623f767ba 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super.x` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
index 0954958d1bc70f9632423387f25cedee3a51d1ab..e636dc056bd18e057c0a47c8ff8d96797ae52c26 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super['x']` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js b/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js
index 8258639dc5c0b4edf945af5ccc863bbf992b20e4..b88fd3d1e26b365d8b97d85bbc20dbf61cc9a9e3 100644
--- a/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `arguments` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-direct-eval-err-contains-newtarget.js b/test/language/expressions/class/fields-direct-eval-err-contains-newtarget.js
index ba117941ed951d86ab646601ba17481d470f69ae..18e70afd0489fb1ed3d214aceaeffa8dbe6d5bd7 100644
--- a/test/language/expressions/class/fields-direct-eval-err-contains-newtarget.js
+++ b/test/language/expressions/class/fields-direct-eval-err-contains-newtarget.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `new.target` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-equality-init-err-contains-arguments.js b/test/language/expressions/class/fields-equality-init-err-contains-arguments.js
index 3ec48af7105f693abb836c5dc6bf8607121b89a7..4a35247f9925456a76b39232bcddbff0f502e05f 100644
--- a/test/language/expressions/class/fields-equality-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-equality-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (equality expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-equality-init-err-contains-super.js b/test/language/expressions/class/fields-equality-init-err-contains-super.js
index 356043abff0f1b75e1aadf31b8e9d40053be501a..6c6ff036a5a8b31bc51c74b2ebb26f8ef03b8915 100644
--- a/test/language/expressions/class/fields-equality-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-equality-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (equality expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-referenceerror.js b/test/language/expressions/class/fields-evaluation-error-computed-name-referenceerror.js
index 49710f9eb4428343fab3b2e5ab7b0971ac5d009c..55b8903ef20a75ef021c5bf12e370a684a8740a9 100644
--- a/test/language/expressions/class/fields-evaluation-error-computed-name-referenceerror.js
+++ b/test/language/expressions/class/fields-evaluation-error-computed-name-referenceerror.js
@@ -4,7 +4,7 @@
 /*---
 description: ReferenceError evaluating a computed property name (field definitions in a class expression)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-err.js b/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-err.js
index 9722a5e9ad00aae028efeba7c6fe598c365ccdea..022302ffe86aa6847a9f538a08259641afaf6f48 100644
--- a/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-err.js
+++ b/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-err.js
@@ -4,7 +4,7 @@
 /*---
 description: Custom error evaluating a computed property name (field definitions in a class expression)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, Symbol.toPrimitive, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-tostring-err.js b/test/language/expressions/class/fields-evaluation-error-computed-name-tostring-err.js
index a59c6c19d0dff8c1c0fc2d9eb03dc3d8609b66ff..a62a628be0a39ec3ce95e63798d2adda26aca3ae 100644
--- a/test/language/expressions/class/fields-evaluation-error-computed-name-tostring-err.js
+++ b/test/language/expressions/class/fields-evaluation-error-computed-name-tostring-err.js
@@ -4,7 +4,7 @@
 /*---
 description: Custom error evaluating a computed property name (field definitions in a class expression)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-valueof-err.js b/test/language/expressions/class/fields-evaluation-error-computed-name-valueof-err.js
index de04dd39546de506e31af3acb0dec0bb65a8d1d9..70cf9c1a42c7d956c059730114289137b98abb30 100644
--- a/test/language/expressions/class/fields-evaluation-error-computed-name-valueof-err.js
+++ b/test/language/expressions/class/fields-evaluation-error-computed-name-valueof-err.js
@@ -4,7 +4,7 @@
 /*---
 description: Custom error evaluating a computed property name (field definitions in a class expression)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js b/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js
index 7c3fa400e0082ca855ea773c6e4f801207472047..dd3799efb650625af37326d8c113fca7b2f04a24 100644
--- a/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `arguments` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-indirect-eval-err-contains-newtarget.js b/test/language/expressions/class/fields-indirect-eval-err-contains-newtarget.js
index 8f84637ef7fbeb6bd84acd55763879359079f054..5334c569ba7f1689c06d3f93851860242fd540bb 100644
--- a/test/language/expressions/class/fields-indirect-eval-err-contains-newtarget.js
+++ b/test/language/expressions/class/fields-indirect-eval-err-contains-newtarget.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `new.target` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/expressions/class/fields-init-err-evaluation.js b/test/language/expressions/class/fields-init-err-evaluation.js
index 00a8d6d037515b8f5d0ce6ad4297e18cf3cf8f0c..dd81e90753ef6bb32a3c1dbfd4f11debbd8b5e10 100644
--- a/test/language/expressions/class/fields-init-err-evaluation.js
+++ b/test/language/expressions/class/fields-init-err-evaluation.js
@@ -4,7 +4,7 @@
 /*---
 description: Return abrupt completion evaluating the field initializer (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     [[Construct]] ( argumentsList, newTarget)
diff --git a/test/language/expressions/class/fields-init-value-defined-after-class.js b/test/language/expressions/class/fields-init-value-defined-after-class.js
index cbf9b0b0189be4e2a5e8a7a0daaf3c5c742db94d..0a2f10d1eb58e3fb386ae527987181f069fec17f 100644
--- a/test/language/expressions/class/fields-init-value-defined-after-class.js
+++ b/test/language/expressions/class/fields-init-value-defined-after-class.js
@@ -4,7 +4,7 @@
 /*---
 description: The initializer value is defined after the class evaluation (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-init-value-incremental.js b/test/language/expressions/class/fields-init-value-incremental.js
index 543d1252230bc1b44569df53931bf829face4d4a..f2d9cc5b5d1611413ee34a98a76f32b8b303929d 100644
--- a/test/language/expressions/class/fields-init-value-incremental.js
+++ b/test/language/expressions/class/fields-init-value-incremental.js
@@ -4,7 +4,7 @@
 /*---
 description: The initializer value is defined during the class instatiation (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js
index 4689b509bad1a04e22756b1c04984b3a2880bb29..aa8f5b44f3fc6d15aceabf1c989adfdce4bf59e8 100644
--- a/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-literal-name-init-err-contains-super.js
index ea7f5af0ae398879cd9926d693b323c7b36be13a..d17e086a124fd2f876c4a2fa805577c9bbdf4256 100644
--- a/test/language/expressions/class/fields-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-literal-name-propname-constructor.js b/test/language/expressions/class/fields-literal-name-propname-constructor.js
index 55c48cc7b63123252298d4b675d20de9349bea2e..61ae16b4ddd7abc06f57c58afe5b5586022bb858 100644
--- a/test/language/expressions/class/fields-literal-name-propname-constructor.js
+++ b/test/language/expressions/class/fields-literal-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (early error -- PropName of IdentifierName is forbidden)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-literal-name-static-propname-constructor.js b/test/language/expressions/class/fields-literal-name-static-propname-constructor.js
index bf6120602cbd81df276e18ce443534037d3c94cf..68f53fa6b91cb72c53fb25395c9aa59e3c91d53d 100644
--- a/test/language/expressions/class/fields-literal-name-static-propname-constructor.js
+++ b/test/language/expressions/class/fields-literal-name-static-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: static class field forbid PropName 'constructor' (early error -- PropName of IdentifierName is forbidden)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-literal-name-static-propname-prototype.js b/test/language/expressions/class/fields-literal-name-static-propname-prototype.js
index 3f1833cd34007d2451081ce2120ff9d57ceaed30..eeae36ff86496a33af1170126de8a4f08a0716b5 100644
--- a/test/language/expressions/class/fields-literal-name-static-propname-prototype.js
+++ b/test/language/expressions/class/fields-literal-name-static-propname-prototype.js
@@ -4,7 +4,7 @@
 /*---
 description: static class fields forbid PropName 'prototype' (early error -- PropName of IdentifierName is forbidden)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
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 46870180f00b697eabbb22ba248e65e4a30dba97..8ed1b87597ef5946122959e63e79bf6ecd78e6b4 100644
--- a/test/language/expressions/class/fields-multiple-definitions-computed-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-computed-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b970a7ab082864196f41f33304f177c6e1f86e31..4de6b2039a54d4a764c553452b10de166af7f696 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c939159f08df8323739f3856a0484be5f704df4e..c6036f85144917aca0300aefb022aa31ebd9df4d 100644
--- a/test/language/expressions/class/fields-multiple-definitions-literal-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-literal-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-multiple-definitions-private-names.js b/test/language/expressions/class/fields-multiple-definitions-private-names.js
index 1c98ebe2057251de75c8941553411157018f092a..716b43beafd0508a80e2f8f2a58d907c49ea2fb3 100644
--- a/test/language/expressions/class/fields-multiple-definitions-private-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a5f10f8d53c5182ce507a5c659404f08229cf128..92ef982b740f13e9fb0fe6b1aa4cea10a4b2ab58 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 baafa5f20896dfdbe068dcfe96e0f66775199003..65e1141c14fb93ec1acf6459f5dc75af7781e390 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ce3c25c9a743a09aa7d7057b5961988024661e07..84a77a9fa87f982464222976ec283b08b354f70b 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-multiple-definitions-static-private-names.js b/test/language/expressions/class/fields-multiple-definitions-static-private-names.js
index bdfe809be62a78fe312bbc323d432ce988515c0b..569bf4009feb9f51c99d6c32296afe575d002d30 100644
--- a/test/language/expressions/class/fields-multiple-definitions-static-private-names.js
+++ b/test/language/expressions/class/fields-multiple-definitions-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 97097bdf346609e99b208910a97edbb061d94740..e2957ad149151a5f392e703798a943811648b401 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 8e0f07b86fd971abf752f59e6cd5d279ed29e363..d9e10fc185080be96a1211d8e836e4a231d4ca03 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 18a70467e29377c149a2b1668ec174ca44979007..d92d329622486636da5779c4d7b869753bf1ac18 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 96a174bb0e4a2b1c4ff3411e172d0674307bbb03..f0a676b3277af0f452899c2663c6356258536122 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-private-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-private-names.js
index 4f912e83c50884e9e5b8f8c71f93c44f777f38be..6dc6095542e5e83413c7aacd52fdd8a825de8c75 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-private-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 49a9e2993567fef6c9957168e2af172e09a86372..9e68617be1ac359eb3a11021fecd7492973f9cad 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 413274ab4b70a355fb20f0edc27720c02d1c10f7..c994b78a6fc0dcfab73aeaffad89347c92dd202f 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 56425c0cbf8587f0e2420997395dd40a51fefc0e..6219861ca64dc1c6c95be440e02408c461340d6e 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-multiple-stacked-definitions-static-private-names.js b/test/language/expressions/class/fields-multiple-stacked-definitions-static-private-names.js
index e9601b9d6143a507eaf44e90bc993ef3c3e69f0a..21318d79cbc0ccf604ad79f4b4b2b6cb8778b37e 100644
--- a/test/language/expressions/class/fields-multiple-stacked-definitions-static-private-names.js
+++ b/test/language/expressions/class/fields-multiple-stacked-definitions-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c82598f1d32ec60900a72854af91181eb1074d1d..90c6b7cd1b3d0f799e039090a7347a5f8edc623e 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c538990e12258e55c4a8e70bd0719bff02e56f7b..e8113932c1d4bc5c5a88dc6029f63dcb6d6229f2 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 141365de3ef88606476eb11ccf97d9a3aa39a06a..3139836e1c35246304b6b3695326ae86ad73a42e 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b17720408bacc7588307e738ae3e914ae3b4ce79..477b4b21fd8d9e573a2913c7113257e9735407df 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-private-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-private-names.js
index 328530ea6288a63fd05570889fffea7c26f507c5..76048e7e0309581ec0d55117a1b8bf390a3f8f93 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-private-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 cf1bd801acb85b7cbbb9c5720e45aefc95fa22a8..464a71538d6b63fff196615ceb378883683be500 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 bf3b03b990e7233363cfb6b9f6c551945de1e9cc..c1a27011cc38e18096567e2cfa9c0b30db80fe31 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 37beaa5098a056890f1ad3ff7686a56ced5f2bd0..45e689f095f1b3b34e657a83de427b4629a9e8f6 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-new-no-sc-line-method-static-private-names.js b/test/language/expressions/class/fields-new-no-sc-line-method-static-private-names.js
index 35d8220560440013150c6105315dc60dd698691c..ab4a9d7acddd9a986343c14d7f83607ce1686d3f 100644
--- a/test/language/expressions/class/fields-new-no-sc-line-method-static-private-names.js
+++ b/test/language/expressions/class/fields-new-no-sc-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 1df04d0d38c7017092109ea00087b0ff1ebf1804..3183a04453394c435e8c75b0b7e008ee5e54a115 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 921408397bb1159508644166ccc40fca53edef20..645cffcce42163d76a639d38efb0aceff90457f7 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 cced2d331f80ea9fe70a05f7f26d29e8f4bf442a..2e3e813a50b140aeb9f1bdf9f052adaf81616326 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 8893e083411671fdbecb58901f613acb4a300faf..2551403195b5696a8f7f1b1dcec8752f9b0084ee 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-private-names.js b/test/language/expressions/class/fields-new-sc-line-gen-private-names.js
index b60ce8c201ad350177f099eb6381793a22733b3a..e72c8e6748e226c417c08855a67ee90702eb8634 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-private-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c4bb6d5c8cc904a69a613f3df39fcafec0066b8e..d2f0dc95bcbba3c7d2fe047550c3427550efd794 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 139abf81fef909c325651e5edb2bc09ca6f178ee..909736bc134fea38b79e52d1a49d619fa1897358 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 3db5e090efd705c2eb7fb46393a049b68183884d..ffaf1c5e196b9c56cad020baaa24eb1e24103fb0 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-new-sc-line-gen-static-private-names.js b/test/language/expressions/class/fields-new-sc-line-gen-static-private-names.js
index c35d0b6ae553249dd56de3f29d28337166ba5e22..e5db6f9d5bb647b43b05d06700026e2e88bd1d5e 100644
--- a/test/language/expressions/class/fields-new-sc-line-gen-static-private-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 49ebe2ed7b2fe6368d2e82482a19310c2fd38738..751a5016a59abbf77c700ce35a5c9ab927acba25 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a8e93701f18c780e9f2abcd59a9d965a850097d7..70f8062e6960cd5be000d5aac04141996c893cc5 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 dfff755cede2d314edb4f3fd6ac0f7b1494a1413..fdf9cf0f756ba9454dd509bc5737cd99abaade52 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b3cf832ab50defbce49576cea46d4f411b2d596a..0f771745d3e805c20a862d5264935148e1c99a2a 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-new-sc-line-method-private-names.js b/test/language/expressions/class/fields-new-sc-line-method-private-names.js
index 571902a94e09748ade09ef7cd07edfd705777f9c..959a5874e48e7ea7403438dd2c145ded52eab990 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-private-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 204b8bb9eae2e3f537b6ad74c1d765c84528f28c..a0ffe35ee5afc4cb7a0861ff26087d9d75e78201 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6e8ffedd2d03e8a33137146e117ed65d36087172..04c6e69d497c5045e877e970d7749636a3696016 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ad46b7dac21aa8fdfa4f9e5fbb211e48d13ee832..93ca7e9f490088b86f3082b5603bc6f607803e72 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-new-sc-line-method-static-private-names.js b/test/language/expressions/class/fields-new-sc-line-method-static-private-names.js
index 2b1c9e0fa2d4f6916763f564fd2b35bd2530eec6..12b45da237f32b922f59bb7fe938ee57b8cba904 100644
--- a/test/language/expressions/class/fields-new-sc-line-method-static-private-names.js
+++ b/test/language/expressions/class/fields-new-sc-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ee56fb939f4c7c9a68704f9d92e0c4d839d8d65b..da012272041a5e5d244097ebc1ad8ef2a0f76fec 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js
index 25382968edc01f47bed268c900f2fd7997e94f2f..adef0588435d3b9e68b9d2312b590143f2047182 100644
--- a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (private field, arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js
index 0dc7da904a0a34019b5df25194f04445c5db7e87..ffc1bb073fd1066e97cf82931c40662e9110d18f 100644
--- a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (private field, arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js
index 39b7cfbf88af48a25a5feb652b11d8a689c56d5e..209cf9c0459cec76fa5a22fe45d3ea5e3f0f2592 100644
--- a/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (ClassElementName PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js
index 47d30a74fa7b331d5664962a426431e8494d4039..92dc9f86b615aee4d2f361b5bd7846a41da8f312 100644
--- a/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (ClassElementName PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js
index 8e32d8ebbd98c07e818e25b1ada650bf38b0489d..1be95bff000095728635b9a386ea0b5f8e2eebe8 100644
--- a/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (private field, ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js b/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js
index cf779b02fde76bb03d1a784a1fd9fdb02fcd4ad3..9623266e3e4afbab3548bb5193a954d277dd593a 100644
--- a/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (private field, ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js
index 20bf095082e731bcd5a61111ee12bfcea484eaed..fa387c5541ea053c9734cb806ec70f342a741f2c 100644
--- a/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (private field, typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js b/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js
index 895f433d0ae39a46a5a2b97121366d56c364fbf0..e6b98810e2c1f341a9d2f486ed00cae6622db4d1 100644
--- a/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (private field, typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-redeclaration-symbol.js b/test/language/expressions/class/fields-redeclaration-symbol.js
index 67fcf3c687f3980b8c91c12686e30cdce524da35..4e42bf38d6cc0215ce1a067990017cf7d6ea63d4 100644
--- a/test/language/expressions/class/fields-redeclaration-symbol.js
+++ b/test/language/expressions/class/fields-redeclaration-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public fields with the same name (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
diff --git a/test/language/expressions/class/fields-redeclaration.js b/test/language/expressions/class/fields-redeclaration.js
index 400cf221083a8c00e34f1ab63248ed3ba678d743..24234ce21bcb106ea40d8ab60c4174c9d0a33959 100644
--- a/test/language/expressions/class/fields-redeclaration.js
+++ b/test/language/expressions/class/fields-redeclaration.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public fields with the same name (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
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 45ccb1fd5a8a42715e8b5562e4660293b32363d4..8b59a90cbab23ba480e70ddec972962ed769bc56 100644
--- a/test/language/expressions/class/fields-regular-definitions-computed-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-computed-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 580d7f36889480b973c4d067db1554ad4cb117b9..33478971803aca7e934cd4b0628bc7f4849075de 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 8f9f3e0bb9e591d23120867b48e8067657c1e3ed..6bcbfd9de5ba39d67653af851cb98b5ae7a5b851 100644
--- a/test/language/expressions/class/fields-regular-definitions-literal-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-literal-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-regular-definitions-private-names.js b/test/language/expressions/class/fields-regular-definitions-private-names.js
index 7e4b0bab9600162abb171c2c976ef90a983d3778..86a26026a4d82ff3107bb51574c9f56620a84fe8 100644
--- a/test/language/expressions/class/fields-regular-definitions-private-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 93aef932ec1a128bc55fbdca225c5e322d00a1b2..d2ccde7dabfddc8a29670dfd7589c791d106ebb8 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 4e30b2984d530fed45f0b2a5bd78a151e019f926..c6048d94bc5027c9914247fafaf79dc03689d885 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d541b7a177ddb8deade354a4f7f3e9923f09d7d8..8881f62da91b8a78bce3c96afe2cf1ba293a6469 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-regular-definitions-static-private-names.js b/test/language/expressions/class/fields-regular-definitions-static-private-names.js
index 15bf4f706a3bf48d9c9aad49611755d2ec565fb9..ca118a4844db811900af57913b0624779cdd6616 100644
--- a/test/language/expressions/class/fields-regular-definitions-static-private-names.js
+++ b/test/language/expressions/class/fields-regular-definitions-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 29d9cb57c457c78bbd75a531ad2ac63782444aa7..d0afcaa36d285340b7b3726332fd707f6e4d7d16 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 f349ea98adc7e3dab597329b2cfd3f8721f2c408..527601afad15d8f690462d24b0225a793f8c7b38 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 bf0837f77f7d7a09a7f6b44109c9cc5465711db1..294259667ec1485449d7833180653eaf83ac1055 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 1c4d82161e21f54b81d47cb4ad8f85bf13f9bee1..0796a955c9ee8be2194e538bfa56f73e599021ee 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-async-gen-private-names.js b/test/language/expressions/class/fields-same-line-async-gen-private-names.js
index 6dd71a32d363f1721bfd19fd83c290cd4ad72c8d..db0ed849928e4af68bba560451851230a798e6d0 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-private-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 64c8a527a547f3f8a630df113cefccd54f4f72a5..854b7f0dd0c5b4479f4dc89f2190259732d2e2a0 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 fa3749b0a7cce21f8c7ed9c2ff921aa13c431c36..ea307cbfd1117b5c8839cbbcabc737fe3767fcda 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 6e9a403f497c7c78cd26f050ea68f5b2c050916c..ec1e03715bccfb37f5a76905d22ec8aa3e32988d 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-async-gen-static-private-names.js b/test/language/expressions/class/fields-same-line-async-gen-static-private-names.js
index f4b53fe2f09d319dcc0ea8e78029f8b3f1ea9ea1..228f0842bcdd937e229b7f0fadf4ab81ad61181d 100644
--- a/test/language/expressions/class/fields-same-line-async-gen-static-private-names.js
+++ b/test/language/expressions/class/fields-same-line-async-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 d4e044bd5cd2fe57df70467772f74bbd4da1c599..b72f2c24548fc1a78eed19dbad7f57b74f3636dd 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 203bb2e13da10c0b6a3a472e0f25c77b720a9654..0de78443c74cef934ed7c6ac66a6662ceb930309 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 5770ba5ebb92f3f7e069ccb13c493c5837d4b823..1519d8d04fe8172b99af410d7cbb3f812f43bdfd 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 350684424c177697d8bf9db4fc951ed2c351ef64..11b3ff42a1b23b80565ca1f176c32911da09e61e 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-async-method-private-names.js b/test/language/expressions/class/fields-same-line-async-method-private-names.js
index db9f61320f639ffe5bd348151297a1ea0d5baa28..c357bc663775386150d621ed74c4584a76c40d90 100644
--- a/test/language/expressions/class/fields-same-line-async-method-private-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 504482b20063ea3b405ea9f85eeea098713c3f04..6ae4cc7ff9a53c3bb41fc6bc4257458da41732b7 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 5b9362231f5516fb409cdb6cc01c5620cd7e4bcd..1852562e0843ac520de8f4fe1ac5b8de78e65dd7 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 dd9ffc174abfbf17a4343e99af387753ca99e1f9..411244ffd358d024c40ed0f9a511cca6aa6724ec 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-async-method-static-private-names.js b/test/language/expressions/class/fields-same-line-async-method-static-private-names.js
index 3ee8358cb8c591888d16b0c761e3e597e0656bc2..688e0d1ff85536e251ff40250f2e609ba2e3debe 100644
--- a/test/language/expressions/class/fields-same-line-async-method-static-private-names.js
+++ b/test/language/expressions/class/fields-same-line-async-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 4cc3a30e4e340c9f964ea36940aed81ba4f51e78..9bc2eac679a083225f7afd204d96fe9c7616923e 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 0ce592e419027f4db8be1bf3bf689123bf00b92b..3306f8e5c228982ab5d1bd1e372790311ef1743e 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ddc7ac06bf0ce1b88310c7c931136b1ebddb67ca..8f038bfb122fc247b6ce1ce433bf856912b0ed13 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 9922b866f9cb5ad96981cb08027e677a5c3a232f..d59e9e2b89741b0a6779c11c57371f663e523621 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-gen-private-names.js b/test/language/expressions/class/fields-same-line-gen-private-names.js
index 2190ae60f93ae9adabce4567bd0cfc6a60bf4361..dad18ab09cb7fc45019d4a12b8b717a0316b3409 100644
--- a/test/language/expressions/class/fields-same-line-gen-private-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 cba4b5ebbf02b9f39b80509b48b259a55b1cdf2f..c420802c9a49268a819c1fe40697746fe4153ba6 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 fea6a763a598d9241266892766075924e63d4c70..9f8d294a33f6f4984be9082208af6cf6d0cf3021 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7fda39fa3a58732775615aead1722c29d74b156d..1d767235b2299a6e8a7159e67c8e323616661bc5 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-gen-static-private-names.js b/test/language/expressions/class/fields-same-line-gen-static-private-names.js
index 22681d821c4d90fc1b7be7c07bf7d27a80278cc2..6d6b79f91081b9c8bf759881dd75029a60bb32af 100644
--- a/test/language/expressions/class/fields-same-line-gen-static-private-names.js
+++ b/test/language/expressions/class/fields-same-line-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 980e7b08d6a9f5cbd5eb52fa11c81de7e4815d45..1765683b6521af0fd6f75d092ee1a6ef7c1e7266 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a4a4991fa45e412584ac799557752f1557462c75..f59805772645bf9e1fc55893b17750899562690d 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ac626fbc5297ce1b3e52ee0296d78686c73f92ae..e063a1ab9be58b50d50f297446e0b5d80f47def2 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6b54c7cff773081990dc058eec4e6aa40b356050..70c7af3f8de1272337a061a1b3378c149ef6436e 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-method-private-names.js b/test/language/expressions/class/fields-same-line-method-private-names.js
index a61bc9d62fe784039fb0030514d8b4c9c16b8c12..354f77ec47e0664e60fee49d28f24835e39a92d8 100644
--- a/test/language/expressions/class/fields-same-line-method-private-names.js
+++ b/test/language/expressions/class/fields-same-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 e48d3ffcc0e207871cd956c384321838ace5e24e..1cdb285ce91ec671579917f9adcc81b961ead9bb 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 0471d359447f2f475b0bb48d349580a5d16fb5ca..b385bd8cc3191e24e5cd0eb5d3f1a1df7fabebd2 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 865035eb7b622dc52b85d2ca43820a7412c62516..5f89385b7cd8a33209921b7b673d0e5fd28bd139 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-same-line-method-static-private-names.js b/test/language/expressions/class/fields-same-line-method-static-private-names.js
index ec145f68ceb857cc4a269bf09017c47ad29a97bc..1dd63147e591631c2fc8fab859d2558ac3a5629f 100644
--- a/test/language/expressions/class/fields-same-line-method-static-private-names.js
+++ b/test/language/expressions/class/fields-same-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7c33c6c85ba370863bd9ab2cfbf58fff62e676dc..e0823a9cd1a4213ae8cd7d5910697b87c8881588 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js
index da3e9b35bcd957a73b241e3f8976eba36a32a142..b844f22e120109fa7c157f9a65df16b95ee42b53 100644
--- a/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js b/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js
index 8869bc253c3ffeedf9ff2052b4918f02a0ee1756..d90ee31d6686c654bf13884e039db3f4318b2498 100644
--- a/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-computed-name-toprimitive-symbol.js b/test/language/expressions/class/fields-static-computed-name-toprimitive-symbol.js
index 62208b26cb5770553dfef2c2d840877464076406..b868295db8a7d9f31854ff2f67df2d7fe7e49392 100644
--- a/test/language/expressions/class/fields-static-computed-name-toprimitive-symbol.js
+++ b/test/language/expressions/class/fields-static-computed-name-toprimitive-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, Symbol, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, Symbol, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-static-computed-name-toprimitive.js b/test/language/expressions/class/fields-static-computed-name-toprimitive.js
index cfce643555f9ff33d9240c1ba0becbbfca439df6..542791039cd5a0e71f5f27e1eb0a255f1bac28ea 100644
--- a/test/language/expressions/class/fields-static-computed-name-toprimitive.js
+++ b/test/language/expressions/class/fields-static-computed-name-toprimitive.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js
index a466e6b330cf7072deed8d7ac374f6a415213425..f299e42c2600659e70426e945d2339800d25a170 100644
--- a/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-literal-init-err-contains-super.js b/test/language/expressions/class/fields-static-literal-init-err-contains-super.js
index 3d2bcd39859f83b3e3f7efe084cea53c3b83504d..97db70a41a3df968271d3f6b11580b43b75633d1 100644
--- a/test/language/expressions/class/fields-static-literal-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-literal-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js
index 6c91c4cfe267e08241f952b55cd9570bc2616a63..d98b9b0aaf0dbbf421ccf1b603d1766216f01dac 100644
--- a/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-private-init-err-contains-super.js b/test/language/expressions/class/fields-static-private-init-err-contains-super.js
index a6aa2a00e8381a336a215bac97e104e1b4ccb5d2..7a3fbfd5e8002d6ade5aad56e6c02d2ba1b50a40 100644
--- a/test/language/expressions/class/fields-static-private-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-private-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-redeclaration-symbol.js b/test/language/expressions/class/fields-static-redeclaration-symbol.js
index bc2546e963fc5aa94c6c77a3a7ece4af2db9c916..c3aaa7bc308323d9f85fb4730f2ee15c33173acd 100644
--- a/test/language/expressions/class/fields-static-redeclaration-symbol.js
+++ b/test/language/expressions/class/fields-static-redeclaration-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public static fields with the same name (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
diff --git a/test/language/expressions/class/fields-static-redeclaration.js b/test/language/expressions/class/fields-static-redeclaration.js
index 1c93ba06118ff20dd4716b2747a490047699e03f..8d81f7f1dccba08c1cde10df8b9080e911d0b739 100644
--- a/test/language/expressions/class/fields-static-redeclaration.js
+++ b/test/language/expressions/class/fields-static-redeclaration.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public static fields with the same name (field definitions in a class expression)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
diff --git a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js
index 5b27331adf76fde164793582faf7afd2f9cecd6e..d4d736ef9b49d07fc52e1cbddabda5f16a320746 100644
--- a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js
index 5ec19a80c6011a3236d08fe83ed18dad9a6ed65d..ed46f9eb9d4607c81149fb1e2be14ffe5b369b39 100644
--- a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js
index 22caa5a0e0f2fe06a1e2801840d3b0be5e2acf42..9cf6504fbd14825ad34301e5e61db9ab82c7a530 100644
--- a/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js
index 90dbfc87e9b62d8885b1056d8a45168a00ac78a2..0e87f2126b60725d7cca79a0174b5bf8f3dbc7ee 100644
--- a/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-string-name-propname-constructor.js b/test/language/expressions/class/fields-string-name-propname-constructor.js
index 781555ee65968b17af78ba5fefa23369b754dca0..92674e7f2f573456779a6ee66ef2af9fa53b5c40 100644
--- a/test/language/expressions/class/fields-string-name-propname-constructor.js
+++ b/test/language/expressions/class/fields-string-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (early error -- PropName of StringLiteral is forbidden)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-string-name-static-propname-constructor.js b/test/language/expressions/class/fields-string-name-static-propname-constructor.js
index 0cc4db117c5bf96a7ef573796ba668ac3ad9dfcb..ba3d61da945ff49c7d1765b5b8fa09f3e6348a83 100644
--- a/test/language/expressions/class/fields-string-name-static-propname-constructor.js
+++ b/test/language/expressions/class/fields-string-name-static-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: static class field forbid PropName 'constructor' (early error -- PropName of StringLiteral is forbidden)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-string-name-static-propname-prototype.js b/test/language/expressions/class/fields-string-name-static-propname-prototype.js
index 4fa7a5deffbf753bd12bd668fb7e9f32d70a767c..318366aaec1e8091891b7b74896894a5fcd8b010 100644
--- a/test/language/expressions/class/fields-string-name-static-propname-prototype.js
+++ b/test/language/expressions/class/fields-string-name-static-propname-prototype.js
@@ -4,7 +4,7 @@
 /*---
 description: static class fields forbid PropName 'prototype' (early error -- PropName of StringLiteral is forbidden)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js b/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js
index 83747f5670ee60251295506688da2b6a9e63c9c9..70c7e5ee54dcb82b073fc12db1866d0320ece864 100644
--- a/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-ternary-init-err-contains-super.js b/test/language/expressions/class/fields-ternary-init-err-contains-super.js
index 7ecd82fe257792ef476128bdb45fa986f8a3d410..48061869bd63a04b3b6913f9a7ff3e774a910dc4 100644
--- a/test/language/expressions/class/fields-ternary-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-ternary-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js b/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js
index adcc4542f22756f29eb559685724a60f43809684..5eac1fa7a277b9ec181b815abcbf4bc2c44d29f3 100644
--- a/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/expressions/class/fields-typeof-init-err-contains-super.js b/test/language/expressions/class/fields-typeof-init-err-contains-super.js
index 0ad4a74ebbc99412c69b374c3f49b2f5e4505f55..cd478ddada6e895e42ab2e7d1512e411003e70aa 100644
--- a/test/language/expressions/class/fields-typeof-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-typeof-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
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 4a43e57de0091079560bd9636757b6eab3be69b7..657f2afece7a8cf0e90b3ef16815ecd8552f633d 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c6b74eff5395c290e15de1fea4f65a5a18ece288..ff4fc8ae925df21a16bc0b81b3fd81898c3f5d24 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 1c4d78e44c5a8bdf267a08a1011c2a01e508d37e..a12d79c9c4c9995ebf911d9907acd1e181a406fb 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-private-names.js b/test/language/expressions/class/fields-wrapped-in-sc-private-names.js
index bb268effc22abcb437b708269bb2493d6f466249..cb551e4c881dd6286532598ad1dfdc0e8d7c35df 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-private-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 ee6921530e8b195b1e0a81a69bc5e20485b4cea1..36c6fa44a3cfa531d4dc9c3297907dd56e8cd0dc 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 5961961f99f2e475cef45fd86cbd4d0092cc0e1b..1f93f5e6de26981a7666afbd03e53b1e7fd3ebf1 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 f5619cdd90d698c2d773631d923d8145e46435f4..c88ad83d6f787fb83ee60cc27570b7e321558ec3 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/expressions/class/fields-wrapped-in-sc-static-private-names.js b/test/language/expressions/class/fields-wrapped-in-sc-static-private-names.js
index 131ef639fbba52be8bdcecd5d62884f0966153eb..95b15414313d6ab4d58f644eab517d276671ee4a 100644
--- a/test/language/expressions/class/fields-wrapped-in-sc-static-private-names.js
+++ b/test/language/expressions/class/fields-wrapped-in-sc-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 d5e192a78e60e416a668f29b54d69c2c3cc01702..1260883fe31508d05fbe984f7cb98b104bfe2a52 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/err-field-delete-call-expression-privatename.js b/test/language/statements/class/err-field-delete-call-expression-privatename.js
index 359c1a75596503d5c12a717bb67efdddadf07be7..bed8c5dcc485a1a3d41b671ca3887d51eb3eaa93 100644
--- a/test/language/statements/class/err-field-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in field)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-field-delete-covered-call-expression-privatename.js b/test/language/statements/class/err-field-delete-covered-call-expression-privatename.js
index 21afe2958c5f11987784fa4b3340f9e8b0cf858a..1b53022bc8807f88bf4d4e53377c6588123353c0 100644
--- a/test/language/statements/class/err-field-delete-covered-call-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in field, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-field-delete-covered-member-expression-privatename.js b/test/language/statements/class/err-field-delete-covered-member-expression-privatename.js
index d1042e1a42cdd12cc2bd1daeda7dc19b8d309166..bdd3d44b265ae0ddedf4343b46ce3a6db7534c17 100644
--- a/test/language/statements/class/err-field-delete-covered-member-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in field, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-field-delete-member-expression-privatename.js b/test/language/statements/class/err-field-delete-member-expression-privatename.js
index 57dea8b7ab4049cc5da1220aca92f59a6a9ce3b5..f9cd9de2a8552ab74339c6752da62061b06f6259 100644
--- a/test/language/statements/class/err-field-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in field)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-field-delete-twice-covered-call-expression-privatename.js b/test/language/statements/class/err-field-delete-twice-covered-call-expression-privatename.js
index f142c1970322d5df9f6f09c89fb62ab5585997e2..f247c186a14b631914faa5cdd14e45eff700fb29 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-call-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in field, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-field-delete-twice-covered-member-expression-privatename.js b/test/language/statements/class/err-field-delete-twice-covered-member-expression-privatename.js
index 41fea77b4364c47c84d1ce74ddaae8fe9b865177..ca5e48afe38d60568177c09ffa0f7d086f910ddc 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-member-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in field, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-method-delete-call-expression-privatename.js b/test/language/statements/class/err-method-delete-call-expression-privatename.js
index f55917d582feb2662ced857dc04c0b934dd88c61..2d4937d416b605f5ed8c3388e7889be4e2855e44 100644
--- a/test/language/statements/class/err-method-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in method)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-method-delete-covered-call-expression-privatename.js b/test/language/statements/class/err-method-delete-covered-call-expression-privatename.js
index b6e14a0c6b03eee199dc7ee584a57d4a42cd72d7..3e915096d7c07ca4d4fffb033c568ef5d901fc33 100644
--- a/test/language/statements/class/err-method-delete-covered-call-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in method, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-method-delete-covered-member-expression-privatename.js b/test/language/statements/class/err-method-delete-covered-member-expression-privatename.js
index 71fc2c51f933e960359889691f2c1291107740c0..e43f9a3404223239eed96e17b8ced361c8f775d7 100644
--- a/test/language/statements/class/err-method-delete-covered-member-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in method, covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-method-delete-member-expression-privatename.js b/test/language/statements/class/err-method-delete-member-expression-privatename.js
index 492410f3cfc731909d1baabf4a8bd5ba0f259737..70f54418eaba9fcb8e2c829f750ef87fdc3e5e9d 100644
--- a/test/language/statements/class/err-method-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in method)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-method-delete-twice-covered-call-expression-privatename.js b/test/language/statements/class/err-method-delete-twice-covered-call-expression-privatename.js
index 9781eb9a5914f9005fe0ceaea1eb8a0fd299c0db..ea17c37732e4dd5957e5041a70dc7d84b3225d3c 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-call-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-call-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on call expressions . privatename (in method, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-private, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/err-method-delete-twice-covered-member-expression-privatename.js b/test/language/statements/class/err-method-delete-twice-covered-member-expression-privatename.js
index fdc6b8c270d20ddf6a6c2dfeb590a49747debb84..087a734c444f67848f46ea5869940e85a255f438 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-member-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-member-expression-privatename.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if you call delete on member expressions . privatename (in method, recursively covered)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class-fields-private, class]
 flags: [generated]
 negative:
   phase: early
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 191d33ea7d7b57a138d1bc70d644265d1c3bad66..15d1dc96798149ed319dfdbf498d1498d8a96d0f 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 df55c55117dfd598ab0f4139da83727938240cbf..03529d08dc9fbfcbb52f68d774862f076e812c72 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c22a4b1cbe3a272b3695b193aae91cda2f2e2839..fd8c939e1c3933f02553accdd4b2e407890d4b43 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-gen-private-names.js b/test/language/statements/class/fields-after-same-line-gen-private-names.js
index eb432e7c36836c21f7bdf394c0de31bebfcda23f..66bcc5a36eed879ce6a0f8c844c830a1cafb2aff 100644
--- a/test/language/statements/class/fields-after-same-line-gen-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a37ec07b434dd5a701bc34868a552918d0e763a3..f89aeb9e00337d5f8fbcfad6877f72b448b75a88 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 20910ae1be358308db776981df3cd91611a5dd5c..5229e5dd46c19b5c0d2f14ad22400df89694f3b7 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 631d7f65928fa02eb3e946dcd4244550713d7151..def6e69bb0dc8698c0785e3d323683fd09cf18e4 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-gen-static-private-names.js b/test/language/statements/class/fields-after-same-line-gen-static-private-names.js
index 661627f28b94287846705abd859d1a2e15fff2ef..adce1dd110e9c5b9f87ee1234dd107c44bad80bf 100644
--- a/test/language/statements/class/fields-after-same-line-gen-static-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 55ce1dfc4b837f18ca0c63c8c52589a8873723be..8e8cc643fc099adc3ef532df5320b01a7156f428 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6c66e7a3f833875732e436c746350309719042ca..fba7b3b901f7facc75588f964777f4b8112a4f73 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 934a6cc1f2f05b83360b00d94c7fc769a17024a0..35f11d9308d2d37fdff7866bad2f98b1d7eafdd1 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 385826f04e175b3e920baf9ed2919538f2415c2a..80ecfe320890b41d19e439b7394db4c74d843f5c 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-method-private-names.js b/test/language/statements/class/fields-after-same-line-method-private-names.js
index 9bd10b389dbc11be0ec42c9fadc25476907def58..b241501c310810b8ba66d74878673a31c7221255 100644
--- a/test/language/statements/class/fields-after-same-line-method-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 de016d517113a685b5a6fc3db08a4e74698bc14a..70ee22cf6d32f177af58badb0e75fb158bfffe14 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d8986e47885924cc2beb65d53a22d5b4cec96410..81ddcbb97c009397b07d406e18db6227539b2762 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 315870852ec6859c5ca288f48a7cb12ea0c75d46..e332e3db76629ef3bae10bc8ac97ee49d8104331 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-method-static-private-names.js b/test/language/statements/class/fields-after-same-line-method-static-private-names.js
index 707084cf7668768ffe33ba1ae8414758587a212c..5b2048a262e51c8b3a08c43622320e478b32db33 100644
--- a/test/language/statements/class/fields-after-same-line-method-static-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c9d362c864e74add938c59335b6ebf8783f64802..096ed952ef348fe1a1c3bb2889ec32c2cdf4ebb2 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 55fc3458b289b6cfbb686f3bf1ba952475e3b48e..ddb34df44af43b0694ebbae861308ea0cfb1f153 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 16a06780abcb6fabd0b5f064c1f37fda53256796..6844ad7fe9c1a415017af829ca8086c4f4ff8285 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 412088cfa19798f057a5dac4006e5239a9628e5a..a98e2cea44d474217e449d3494a27ef70dbab002 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-private-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-private-names.js
index e949295692481aab7143d0a23bdb1b7b9d35fc9b..3f40e656f09b09b7d00270f567517b0fe064093b 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 ff032396817a243a64a28bbdf754d289714f85a1..3a138b2cecdbd0aa4c947dec2610ff5578f6de87 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 63d45a761f06c00354d519dda09c074c85439970..988264b0e66fd219d4765b918f0ee5f8471a74f1 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 9f88a2c8be1565e6ac6975cd25e370a456b0d7ee..1a8c253ddcc2a69deeac358add8966b151c4bb74 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-async-gen-static-private-names.js b/test/language/statements/class/fields-after-same-line-static-async-gen-static-private-names.js
index 34ecf2b277acc3fbcaf24347de7f7290f07a0e54..6e7147238cd163089950d6472a74583ce204f65e 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-gen-static-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 61c35314e9ed210dbe3a522cb499a15fb3822834..294388a982aae58097f1c4a4fd7a81207da32e60 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 8b4c8828caf0c45edc58a03c88a01a1cb4e5ada0..f8a85cd330f2223ce7ca579338ed32454de856f8 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 10d9595fda182a1dee84925c8c19f1569d97f13b..e02eb6a006a0bd236b3765a9ab5d490a34f36d1d 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 d05e864e54c51a1cc26614d3270094ce22adca22..7652c546a7c4275a173365802242451ed2cbcd03 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-private-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-private-names.js
index f0e01062089ef04d93cabf267b31244b41ef4584..bc001aa284ec1a57e74968a5768b279f7b673b41 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 848dd7e45b66aed581cf7f11a054c68cb8e70bb0..852e2380f4bb28bc70c19f64789a675c38d867f3 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 763490993e3eb154335d0a4d2d9f3bc6b94c0b23..0f8bad1a235a6aca50c22dc27dfcd371fe426853 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 c7259b19e2946a003ddd3718a7450a4a5214709e..60cfd6a14d18a0c1058f6e02c4d87cd72bca9e31 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-async-method-static-private-names.js b/test/language/statements/class/fields-after-same-line-static-async-method-static-private-names.js
index afdd3cbc7dce2ec1edfb5ea3563b908b8c2763ac..953e9a45696b59f3121655f4e17c21fba5a07371 100644
--- a/test/language/statements/class/fields-after-same-line-static-async-method-static-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-async-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 4e4711b41b1d1dfe949fbb6a59c870a8dbeb4b1b..dde92722fa9d0dd5a421478e2c56f8f7ff027bb5 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 1cdc688a9e227656da58e540fd492fd56f028408..f39b0629a62b28bbabc3c8b4ae0234f46c36970f 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 77eb19764fbeec3a90f507fe27d4c3c093cb1928..df6e52c3922bc70a4e1c4023b87be3b7da4d5f8d 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7d3993675022b57b963fa04f49800e0577b9a99f..7ac589657567cf3ec475e87ff5fdd48b69def9a3 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-private-names.js b/test/language/statements/class/fields-after-same-line-static-gen-private-names.js
index 6fd848740385c66fd463c1b32c1ab53c5e39d7ec..c6799db962b06b5345b2cc315bac04524e16ca5c 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a93a12838496757fe747d97b9cedebd0077365ef..2378057dccd2e2023538b6a1c31d791d714568b5 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, generators, class-fields]
+features: [computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d6c9bec0ddafce58b73dc15cb2b8e710bb8a3f7e..b61d7eb57a896465faac88c6bb83e1c8f1a19a21 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, generators, class-fields]
+features: [Symbol, computed-property-names, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 66cf683d2ba5c723e6d376cf06627888fa91fdb8..0d05975b1f3216ab56f8e2056710de2c6712fb2d 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-gen-static-private-names.js b/test/language/statements/class/fields-after-same-line-static-gen-static-private-names.js
index 627e5a862d1f491db8b766e15334adee092dbae7..3e1f77fae1fa95415da7f08b981c81b41d9110c2 100644
--- a/test/language/statements/class/fields-after-same-line-static-gen-static-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [class-fields-private, generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 fbe016345d286fb22f3b01d2a6d5e1871cbedacb..2c602452be9e67f4a5c7ed59b276b68f382b20c3 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static generator in the same line)
 esid: prod-FieldDefinition
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d886022dabb68a7bfdd9cd071b69480a1e5ba655..bb655ff2e9b7431f25214dcd508eec1e2b05a619 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 dcccd17c677437336bd0362d9d533677bb5b511d..d66c3d26af69e590f36398f2d09f258d817981dc 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 5a20003744dfec8d8a743f38c59204f25f409735..6f9ec4a4c7705df533150fce2e619c3b0639d5c9 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-method-private-names.js b/test/language/statements/class/fields-after-same-line-static-method-private-names.js
index 9d673aec19436db7fe84c5cfe070aaedc48a4a17..e270cbe50777a6491b27ad432597418775705785 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 440e83c18892611ffbc07d26beb2f8c45826ca7a..c08e3c3b0e8029a34cd1e4e4fe0e2f1e4c344759 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 74a88b2fb85375e27a5b2cdf8735fb09f938084b..532958a415c86c43261becdf7a9e158a4f2995a8 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b14e3ec07694b86fb7161ef84c8178b1a073f527..b2c7c6a7af82f65c2590b818986486e93b68677e 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-after-same-line-static-method-static-private-names.js b/test/language/statements/class/fields-after-same-line-static-method-static-private-names.js
index 1e9f37a9f9fc9d2ca7fabfb9b886846391c4b8fc..419ec93c8edf014f6280bc63b8999db17e6ec219 100644
--- a/test/language/statements/class/fields-after-same-line-static-method-static-private-names.js
+++ b/test/language/statements/class/fields-after-same-line-static-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 bed239d4672bab053de492648f1c6bbda35fa1cc..8c0c9b2a5b5b105e5de79a8cc8a2548157d06c3c 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after a static method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js b/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js
index 9fbf9ce7c3fe17f1dac0d7a7e9bf5c428fac7ea0..14560d3d9ccc0a965f5124fb16de24dfba8703c2 100644
--- a/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js b/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js
index e1f0941e03f6e02e3b5a6a3a45668b12d2386ef0..8aa7b1ca652b7304542646b8b0f66fce295d43b5 100644
--- a/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js
+++ b/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js b/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js
index ad4c766babe00a5427bedbb50f98f75e0cee2577..5f931c9506ebd2f5a73d0b063b5a66febc1cfcc9 100644
--- a/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-comp-name-init-err-contains-super.js b/test/language/statements/class/fields-comp-name-init-err-contains-super.js
index 7622021508596258aa5160dac03ae5055f50808b..00f28d5fcc5d46cff70d0d03a1682bbc6a016d74 100644
--- a/test/language/statements/class/fields-comp-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-comp-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-computed-name-propname-constructor.js b/test/language/statements/class/fields-computed-name-propname-constructor.js
index cf1f1514d55f0041c6641ed4e39fa39e37cbfe9f..f528e03bd2b63481655d2d511b3f34452ac4aec3 100644
--- a/test/language/statements/class/fields-computed-name-propname-constructor.js
+++ b/test/language/statements/class/fields-computed-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/statements/class/fields-computed-name-toprimitive-symbol.js b/test/language/statements/class/fields-computed-name-toprimitive-symbol.js
index 30a143d73250b2aab480cbc84b9b3e62993f6485..a38db9e6657595ddf6f35d53d55113d758d3de26 100644
--- a/test/language/statements/class/fields-computed-name-toprimitive-symbol.js
+++ b/test/language/statements/class/fields-computed-name-toprimitive-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, Symbol, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, Symbol, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-computed-name-toprimitive.js b/test/language/statements/class/fields-computed-name-toprimitive.js
index 16949948548a215ac59db85433d5ef507165b1ff..67af44ede2848f10f85f9ef893cad2986d8c1afe 100644
--- a/test/language/statements/class/fields-computed-name-toprimitive.js
+++ b/test/language/statements/class/fields-computed-name-toprimitive.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-computed-variable-name-propname-constructor.js b/test/language/statements/class/fields-computed-variable-name-propname-constructor.js
index 161554838d2066db3c55bbbad2256b600b829c77..2b7aa5a78e494ed10ef0bce56c992e2cdc3b91b6 100644
--- a/test/language/statements/class/fields-computed-variable-name-propname-constructor.js
+++ b/test/language/statements/class/fields-computed-variable-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/statements/class/fields-computed-variable-name-static-propname-constructor.js b/test/language/statements/class/fields-computed-variable-name-static-propname-constructor.js
index f0060dacbb825a60443227a6b27497c70562a9d3..fc5515e52a8214da9c76ac15f098f8f2119771c2 100644
--- a/test/language/statements/class/fields-computed-variable-name-static-propname-constructor.js
+++ b/test/language/statements/class/fields-computed-variable-name-static-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: static class field forbid PropName 'constructor' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/statements/class/fields-computed-variable-name-static-propname-prototype.js b/test/language/statements/class/fields-computed-variable-name-static-propname-prototype.js
index 4b2e7a6d15084e86af7abf800c06890b7a8df4a9..400efb97adaddcdead8684488fb48308437e6d67 100644
--- a/test/language/statements/class/fields-computed-variable-name-static-propname-prototype.js
+++ b/test/language/statements/class/fields-computed-variable-name-static-propname-prototype.js
@@ -4,7 +4,7 @@
 /*---
 description: static class fields forbid PropName 'prototype' (no early error -- PropName of ComputedPropertyName not forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Static Semantics: PropName
diff --git a/test/language/statements/class/fields-ctor-called-after-fields-init.js b/test/language/statements/class/fields-ctor-called-after-fields-init.js
index 08ca1bf801b7cb079127dfe9fe660138faf75067..e9c44bb1bbe6e2a0644c7be858e4418bd42f1b2b 100644
--- a/test/language/statements/class/fields-ctor-called-after-fields-init.js
+++ b/test/language/statements/class/fields-ctor-called-after-fields-init.js
@@ -4,7 +4,7 @@
 /*---
 description: The constructor method is called after the fields are initalized (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     [[Construct]] ( argumentsList, newTarget)
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
index e357b30cfce03936b36d77af7430a115372d6db0..ec3eae5459f5b5240607c8a3b90bb312e285e9b8 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()['x']` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
index 5ada210582a02bc6bcbed44a41416190cab386fe..bd7c9757e33197efa5694f887208e7468480b919 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super().x` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js
index f194242c6bab43f6bd9378d7a96b67deb7a2e6f5..3e988d94feacbaee3e848704229221e53f9e218e 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
index 0e766f52fab4a9e01f25de65e192e22f832f17de..7f3963b1f48d17549970e00aee512023cda4d70f 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super.x` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
index 00b98d4877d3070814f8d639827832b096a76e0c..b6df495eb2d73c6547d51e13660dad9eaa0b7683 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super['x']` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
index 41b19537398606190fa0a91bbeae215e3e6dcb0f..16b468837be238efe7fc89bc05918f2cde4a2af7 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()['x']` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
index 7773dd40edd3ab525018158b822e1b1cd7de8d8b..b7492996cdce0615c6d02b68875a66524c121bbf 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super().x` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
index 16c819c58d3ae6e5bb5da591151ec72cb4a91845..d3554fe95405319e7d7b57f72a702be573f35a69 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super()` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
index d22196ea6d63636c994e9d7e44a8950ae3059cf5..e71f434467a29433eeb108f31abb47fb7b037b97 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super.x` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
index f006795f1ef0bf1f935bfacfcebb554cc5ca7404..ee79439a6849d17109453e3c4bee3f54425f38b1 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `super['x']` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-direct-eval-err-contains-arguments.js b/test/language/statements/class/fields-direct-eval-err-contains-arguments.js
index 173fcae0614dd24c529e432636865485796fa869..092dee5b209c7dd86925fda82cf22047c7a08b7d 100644
--- a/test/language/statements/class/fields-direct-eval-err-contains-arguments.js
+++ b/test/language/statements/class/fields-direct-eval-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `arguments` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-direct-eval-err-contains-newtarget.js b/test/language/statements/class/fields-direct-eval-err-contains-newtarget.js
index 4a3babfaaaa9de273f5c474b37b0d111e6342852..f78cdd02686f36c21f3219635308fe1bd7534523 100644
--- a/test/language/statements/class/fields-direct-eval-err-contains-newtarget.js
+++ b/test/language/statements/class/fields-direct-eval-err-contains-newtarget.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `new.target` in StatementList of eval (direct eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-equality-init-err-contains-arguments.js b/test/language/statements/class/fields-equality-init-err-contains-arguments.js
index 0889c42b99d3d1139dd1fed7bfe998a753349b98..19734f72f0232c4577dec00209d074cdb8392ab6 100644
--- a/test/language/statements/class/fields-equality-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-equality-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (equality expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-equality-init-err-contains-super.js b/test/language/statements/class/fields-equality-init-err-contains-super.js
index 32a55253c333abff3e0dfe5c6cd9c00e873cf2e3..c655a758218e2c1bfa82ffba45340e1733c8e2c0 100644
--- a/test/language/statements/class/fields-equality-init-err-contains-super.js
+++ b/test/language/statements/class/fields-equality-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (equality expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-referenceerror.js b/test/language/statements/class/fields-evaluation-error-computed-name-referenceerror.js
index 9ff604214916c3ca90ce50d246f72ae807691c86..43c01a9af2a44825c8d64d2850a14923f5529887 100644
--- a/test/language/statements/class/fields-evaluation-error-computed-name-referenceerror.js
+++ b/test/language/statements/class/fields-evaluation-error-computed-name-referenceerror.js
@@ -4,7 +4,7 @@
 /*---
 description: ReferenceError evaluating a computed property name (field definitions in a class declaration)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-err.js b/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-err.js
index 14a6522df5817fd414d862be8816e05c5734efab..c839551e89eb51e8e2e1741a69eab366493310a6 100644
--- a/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-err.js
+++ b/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-err.js
@@ -4,7 +4,7 @@
 /*---
 description: Custom error evaluating a computed property name (field definitions in a class declaration)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, Symbol.toPrimitive, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-tostring-err.js b/test/language/statements/class/fields-evaluation-error-computed-name-tostring-err.js
index ca38dd5b0892f639e9577f35a79c7afdeb096730..6abf0cbbc208e37933cc072c0024fb2934988694 100644
--- a/test/language/statements/class/fields-evaluation-error-computed-name-tostring-err.js
+++ b/test/language/statements/class/fields-evaluation-error-computed-name-tostring-err.js
@@ -4,7 +4,7 @@
 /*---
 description: Custom error evaluating a computed property name (field definitions in a class declaration)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-valueof-err.js b/test/language/statements/class/fields-evaluation-error-computed-name-valueof-err.js
index 757d9d536ad09210dc9d67efe18e1346d0dbb6b2..663cf91cc5c5139e32087c303d824e63f4a06969 100644
--- a/test/language/statements/class/fields-evaluation-error-computed-name-valueof-err.js
+++ b/test/language/statements/class/fields-evaluation-error-computed-name-valueof-err.js
@@ -4,7 +4,7 @@
 /*---
 description: Custom error evaluating a computed property name (field definitions in a class declaration)
 esid: sec-runtime-semantics-classdefinitionevaluation
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 info: |
     Runtime Semantics: ClassDefinitionEvaluation
diff --git a/test/language/statements/class/fields-indirect-eval-err-contains-arguments.js b/test/language/statements/class/fields-indirect-eval-err-contains-arguments.js
index 32c2100c9ee81d2d5dba8ef815a042acd4ef4ffd..376c0147504e65d120dd9e852e8da0e00e6a9ab1 100644
--- a/test/language/statements/class/fields-indirect-eval-err-contains-arguments.js
+++ b/test/language/statements/class/fields-indirect-eval-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `arguments` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-indirect-eval-err-contains-newtarget.js b/test/language/statements/class/fields-indirect-eval-err-contains-newtarget.js
index c1d69b70b2d7b8125e6d1fcb4bbbf5a2ab12012d..84de701471d30fcc4a328c9a56bdc08cd57812a0 100644
--- a/test/language/statements/class/fields-indirect-eval-err-contains-newtarget.js
+++ b/test/language/statements/class/fields-indirect-eval-err-contains-newtarget.js
@@ -4,7 +4,7 @@
 /*---
 description: error if `new.target` in StatementList of eval (indirect eval)
 esid: sec-performeval-rules-in-initializer
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     Additional Early Error Rules for Eval Inside Initializer
diff --git a/test/language/statements/class/fields-init-err-evaluation.js b/test/language/statements/class/fields-init-err-evaluation.js
index 016fd1d52a8fd7fb2662adb453761fcff072a38f..67c9b0200bd7bbfaa6f8b481daaca1c2fe582de0 100644
--- a/test/language/statements/class/fields-init-err-evaluation.js
+++ b/test/language/statements/class/fields-init-err-evaluation.js
@@ -4,7 +4,7 @@
 /*---
 description: Return abrupt completion evaluating the field initializer (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 info: |
     [[Construct]] ( argumentsList, newTarget)
diff --git a/test/language/statements/class/fields-init-value-defined-after-class.js b/test/language/statements/class/fields-init-value-defined-after-class.js
index 02c6c1b1a8904a2317ed0aafc06f23f5460ab209..8c8eac3a268855bf7c10fd10fed9849e64f30e1a 100644
--- a/test/language/statements/class/fields-init-value-defined-after-class.js
+++ b/test/language/statements/class/fields-init-value-defined-after-class.js
@@ -4,7 +4,7 @@
 /*---
 description: The initializer value is defined after the class evaluation (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-init-value-incremental.js b/test/language/statements/class/fields-init-value-incremental.js
index 69b3aa6173fb22831a6b0a08c1f13fd27f3c1d58..0195d25151998a885f888ad4319e5c46044b56cf 100644
--- a/test/language/statements/class/fields-init-value-incremental.js
+++ b/test/language/statements/class/fields-init-value-incremental.js
@@ -4,7 +4,7 @@
 /*---
 description: The initializer value is defined during the class instatiation (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js
index ab39930b272320d78eb5a9b41dc1f1b3dff9ccba..1405c4993fa10ad47a12079ac7d9926666898b74 100644
--- a/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-literal-name-init-err-contains-super.js
index e1da665e4f70b6555151abee49ae840b7011842d..be8c0f893824441c7f1ebadea44e6cf65b78ed97 100644
--- a/test/language/statements/class/fields-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-literal-name-propname-constructor.js b/test/language/statements/class/fields-literal-name-propname-constructor.js
index 24d8347b305ffb0e9844899cafa1f5fd1a3fd832..4a41c5bc922969527c80d8c78063bd569345c16a 100644
--- a/test/language/statements/class/fields-literal-name-propname-constructor.js
+++ b/test/language/statements/class/fields-literal-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (early error -- PropName of IdentifierName is forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-literal-name-static-propname-constructor.js b/test/language/statements/class/fields-literal-name-static-propname-constructor.js
index 0a457f87c85d075a6205f96acdce56d071fbca2c..2612862987c89a1276e3fe2cdcc2e31f48dc7d0a 100644
--- a/test/language/statements/class/fields-literal-name-static-propname-constructor.js
+++ b/test/language/statements/class/fields-literal-name-static-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: static class field forbid PropName 'constructor' (early error -- PropName of IdentifierName is forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-literal-name-static-propname-prototype.js b/test/language/statements/class/fields-literal-name-static-propname-prototype.js
index 221c7d00a82c68c594dd6175f2008dd928d99e64..877609beaef8cab85d866d68cc15847b480aa94c 100644
--- a/test/language/statements/class/fields-literal-name-static-propname-prototype.js
+++ b/test/language/statements/class/fields-literal-name-static-propname-prototype.js
@@ -4,7 +4,7 @@
 /*---
 description: static class fields forbid PropName 'prototype' (early error -- PropName of IdentifierName is forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
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 37851870665915ca61d91d70e0ac9eb2d44d9b36..6d7b1c498914f9426b24db0b64d1bdb476480cfe 100644
--- a/test/language/statements/class/fields-multiple-definitions-computed-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-computed-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 be6f4eafcc200fe295ca9c6843fac0b9111a3c42..813aac64b2759662500f1669e48914c30e4e62c6 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 9a6c095ca4505b502d33a948f98bec15107dc26c..63d8ad694cf962410453521eca6f795c332675e9 100644
--- a/test/language/statements/class/fields-multiple-definitions-literal-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-literal-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-multiple-definitions-private-names.js b/test/language/statements/class/fields-multiple-definitions-private-names.js
index 49137a5220a664c420d83e1c423dfa8a736e7612..6ea8e962786288af2afef72ca6abe6b992510f09 100644
--- a/test/language/statements/class/fields-multiple-definitions-private-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 fd284a15059895d5761648dd5f8d3edec28f52e8..593e42cf51c596f8a3c8d4d2e1b8df63bc0ad879 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 fa3249a63d55ea0ae32741002c4a080f9f9f927b..d797f2e071c49b5a306f4112f076a8d27fecdfd7 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 fcce13524b5fdff9e51685fb98c4776d16862d08..04c83de2c2607a4adb4ad3e03a8b629de7769442 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-multiple-definitions-static-private-names.js b/test/language/statements/class/fields-multiple-definitions-static-private-names.js
index 269eb2da9a757f24c9b27d9c9b9d87a9df02171e..f30c49aad70b6b71e669cbb944a4c156daa14ffe 100644
--- a/test/language/statements/class/fields-multiple-definitions-static-private-names.js
+++ b/test/language/statements/class/fields-multiple-definitions-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 89e67454822fe48eca6a1aa77dc41e4e5f29de81..8ce2d2fd051b67ebf83e4e4f9b6263df1d13c64a 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (multiple fields definitions)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 8f30b92b60b33081cb7459f8302344f855108c1f..69b0916c964b43a29db0abf471c77304b4b100f0 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6d29a5804fce243acab725e44c6cd68b0a97a326..9bfeb243fc2734b2870eb01ea9d1a3029bf47d82 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7f804dbc5000947e16a340b733ee1ff4ca53e0f1..db7c211752a7e0f83338d1338517bf7637baeca3 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-private-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-private-names.js
index 0aa16299ba43e541c509586ac3184a94207dbe27..e88d530aca5c7563b3995a23fddc0af69fc7d40e 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-private-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a5cba7356569096fec49a51b624612b58e128ecc..a3e0748c5ee53721a8bb804a6bf487a5906ef2d5 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c00c63eae4073b67803efb09f856603a7bb8217c..0ebbb9b091b059537986d4d34b9ca47aee67097a 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 c022d9da95ef5f3848a9fd6ee101a8716bd51adf..9040bb149f5f05e5d102a5dc7be6108000c284ba 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-multiple-stacked-definitions-static-private-names.js b/test/language/statements/class/fields-multiple-stacked-definitions-static-private-names.js
index e62a240363eb8050531a954a3a299ea1127e3177..3857f74bb98a181730b7f68795d2486eba4a09ec 100644
--- a/test/language/statements/class/fields-multiple-stacked-definitions-static-private-names.js
+++ b/test/language/statements/class/fields-multiple-stacked-definitions-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 935d0c8b3a3e979b4927b0c32626b2874868e174..fffb53f4f1ad4da1db9d83ffa49b54b8e9402c08 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (multiple stacked fields definitions through ASI)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 f3aec9048cff9ff890e79777b44a4ca3c4650072..5d4f003d66504ee7155eac072987cd18ac3843c0 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 4e026e044162f942cca1f997dce4e99327ada8de..803d75477e12d59b32003077a69af41b487acada 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 491124ad51578f640b139021a3a24f9f5a8f3f11..ae718c8241b3688897ccb8a4964189f56d4c6cfd 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-private-names.js b/test/language/statements/class/fields-new-no-sc-line-method-private-names.js
index de82858d81edb5632dd1b7ecde73a99028a0c291..f57b9ac5bb878df08dfb6fbecaf3e2bae387a002 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-private-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6aa47e5f67855f764a2f970d32583d66802a0afd..02514b3deb01bb389a4cbdaa87289318d3ec7bce 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 a7470fff198838409781d4fd236d88cc6646da1d..dd8a575a56b64fb4c7c626271b11f4c5648562f4 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ed5332d92e188ff806fb23f409515a87047e15ea..6ac9918faacdc1345bf20b7a8709c1dca2e077de 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-new-no-sc-line-method-static-private-names.js b/test/language/statements/class/fields-new-no-sc-line-method-static-private-names.js
index 225f47f1553143400e6c94c39fdab95f54e2f966..c8b3485650a3a67a1375e83635ede3793c7caa34 100644
--- a/test/language/statements/class/fields-new-no-sc-line-method-static-private-names.js
+++ b/test/language/statements/class/fields-new-no-sc-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 dd2fe2ba564f6cf5d7f4e2ba5f7a387a805a948e..e376980dfc4eeac829b23424de844c4c60119418 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in a new line without a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 946a3baece1e20985189958f6119d084df2e7c48..4a4acdb9c865476ec9aefa1c7d06757d82bca493 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7e1fe2e9f49bcf0782a9a8d7f01ee0fac9475b95..3c8a55c93befb9338786ccf819b11c3f427a0128 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b85f07f025438cbbad9906a9b77276f9accdf79a..65966a09cb093c6df19c4cfae4d7c0a8259ac602 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-new-sc-line-gen-private-names.js b/test/language/statements/class/fields-new-sc-line-gen-private-names.js
index 1e413c36b8aeb4489c80fcca5937c7aa097c86b7..540ad191c952d9c470dd2863ac66432148c79370 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-private-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7c4e532d44b396a9c5adfe9bb73de95ed6f7bfc4..2fd70234b0f316735c27b823bced688b96c4b095 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 afbf5546b15f66104ee975d6081a8200e64b1674..8b9ad5ae4ac76499cde110f2460db6b150951224 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b2e90d58073d161e12674b85d9738f99213af669..07dd8dd5f38a75f7ae98b3479395e184d4b34360 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-new-sc-line-gen-static-private-names.js b/test/language/statements/class/fields-new-sc-line-gen-static-private-names.js
index c277f658f64c44f82b497e4c59c85c4eadb5bfa6..45f9d18409e28b13be745996324485d761c4102c 100644
--- a/test/language/statements/class/fields-new-sc-line-gen-static-private-names.js
+++ b/test/language/statements/class/fields-new-sc-line-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 3c208f393f08ea7e373713b9725b44c11aecab24..2409d6ae0b86b0e0078058eb223307613645353b 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 48f29f0e447e918a86c8817c7b0ef7872efdd961..7c2520cb9c74933ce3b7afd8e85053913b14faec 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 44fee8284b975cb2b9c5328619ec6cd1aaa4a075..1e305c017d444730ead1ad96f4120e152d63e7fc 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 f39940f926d50944f8976ba8645ad66f30ba65c4..96b9f225a34a6ab4f24961490309a690035f41ab 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-new-sc-line-method-private-names.js b/test/language/statements/class/fields-new-sc-line-method-private-names.js
index 021ccb3bda921ba8aa76a94a7dbd0633fdbac0e4..9b095ec504144e235c3c521a57070161f6bd8d3a 100644
--- a/test/language/statements/class/fields-new-sc-line-method-private-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 24058524aa770178c187fb6424d4cb0696bcefc1..ffedc6cfe8612601d5f78687b768961d9e080eed 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d21b53adf829c97a5018199f00ef09bdf8cedbe3..3e917bde62061703e633f5e2d7f8dfceb80e9b18 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b40af24dbe86c2f4b382eabaaaa915faef59716c..ac54f0d91dc05ce95a5133679261c20c6e6d8912 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-new-sc-line-method-static-private-names.js b/test/language/statements/class/fields-new-sc-line-method-static-private-names.js
index c8fb0633f66d0289baef90b9181a0d4c2ee0281c..46079d45cc23a9d8702d7849c3d15c29948ffa5b 100644
--- a/test/language/statements/class/fields-new-sc-line-method-static-private-names.js
+++ b/test/language/statements/class/fields-new-sc-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 0628ca0f6ce295ddb842a32ba8a55baf467e157e..9377cf759384aade5a28159815ec115727e3ceaf 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in a new line with a semicolon)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js
index eea9bf4d276a30a236ad352465390bbddfba05c7..e6eb77640dd58f14cccd5ac9ca1d0c0f0e36da47 100644
--- a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (private field, arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js
index 50cfe3ec09eac932c4ecadcb2bdaca3b191d31d1..85d2b6a18512c62da62f94cc4b2a0d32b8aefa38 100644
--- a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (private field, arrow function expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields, arrow-function]
+features: [class, class-fields-public, arrow-function, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js
index 11adaeec7a0729dfd44c5fa3984b65270bc23d9a..2fd32c3641bdb5405e5007705578a0d7091b10ce 100644
--- a/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (ClassElementName PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js
index c234a22943cbafa5b94f2e84c93133dff561a76b..4545a88d1b1c241f3f033590050f60a0b9ba5cde 100644
--- a/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (ClassElementName PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js b/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js
index 873c64d810261155f726f13cee6a1ada426ff68c..1bca215dabaa0e6a0c30b48df7e5198851ce143c 100644
--- a/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (private field, ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-ternary-init-err-contains-super.js b/test/language/statements/class/fields-private-ternary-init-err-contains-super.js
index 785117d8e5d578500505a995d10faf23e1961b46..9060a7f1ebc06c74f7d13d18a9430f16f03085f6 100644
--- a/test/language/statements/class/fields-private-ternary-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-ternary-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (private field, ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js b/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js
index ef7d5af286ec1e5c0ea766c80d603cbb60517f29..eda306595aca5342748e521b990b060b19175187 100644
--- a/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (private field, typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-private-typeof-init-err-contains-super.js b/test/language/statements/class/fields-private-typeof-init-err-contains-super.js
index 7a623353a333d621ec672ddae672fe39e0e44062..1fdd0b1f21fd1782854858e07648c6d2f19f297a 100644
--- a/test/language/statements/class/fields-private-typeof-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-typeof-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (private field, typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-redeclaration-symbol.js b/test/language/statements/class/fields-redeclaration-symbol.js
index 8f623b608258c8a5ed4222fdc7d504a1aa7aa32c..5d3337f356ab6569178a1b1dbeb049f8361d2d96 100644
--- a/test/language/statements/class/fields-redeclaration-symbol.js
+++ b/test/language/statements/class/fields-redeclaration-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public fields with the same name (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
diff --git a/test/language/statements/class/fields-redeclaration.js b/test/language/statements/class/fields-redeclaration.js
index 1b16dc01ee7ad911055edf16a6b864cfa17b4605..3cc850ada8e5eb0574a29f3844eac470d4e903de 100644
--- a/test/language/statements/class/fields-redeclaration.js
+++ b/test/language/statements/class/fields-redeclaration.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public fields with the same name (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
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 cb357d7882d78413504d3cff3adc17c86f483c50..fcd8f2be2e773f5bc95f2e731749fd6bbca66772 100644
--- a/test/language/statements/class/fields-regular-definitions-computed-names.js
+++ b/test/language/statements/class/fields-regular-definitions-computed-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 aecb50ff95e3670454acda9f94beb7cc2cea1268..88c2d21f6495e5d7b384d21b0d2a593c3f44cc39 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 d219f3127315d82a438f9d1a276630ece7adfbe5..170ab303d6a00e8ea0d8ed9d9cd9d180115ed5aa 100644
--- a/test/language/statements/class/fields-regular-definitions-literal-names.js
+++ b/test/language/statements/class/fields-regular-definitions-literal-names.js
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-regular-definitions-private-names.js b/test/language/statements/class/fields-regular-definitions-private-names.js
index 2f93a8e03d1333836ebde2b6bc73060f5b99ba0d..2c482495a09e7321c2c6a9c4c798b28f5d5bbf3a 100644
--- a/test/language/statements/class/fields-regular-definitions-private-names.js
+++ b/test/language/statements/class/fields-regular-definitions-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 62fd0e9d39d6f327cd72c6fcca07e6869ef977b2..87a80650e2f54cb210d953a7d35f074cccfd2a75 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 69a3fe4e73fe1af76b4ee9cdb67cacda3d92baa5..c9ab45887472c32b97cdd50427d50c49ccaa6a19 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 71ff94cd1cfd40ec80d2165cf287921c1de25c8e..74bea2f29ce1cd6606d9e2ea6630babc408512eb 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-regular-definitions-static-private-names.js b/test/language/statements/class/fields-regular-definitions-static-private-names.js
index 2c66173b311ea974877ad0c5eac51eadbb592878..fca552f0ba95c43544eb1ffadf922ee38a807614 100644
--- a/test/language/statements/class/fields-regular-definitions-static-private-names.js
+++ b/test/language/statements/class/fields-regular-definitions-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 87424e4ef9f3b2bc3092a08657b1a82999067d6f..cc8ea7ce7d5291314c461d39e3a0305dce074e52 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (regular fields defintion)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 7e57463aea838435590c62661386bde9461c36ed..0d032a776ca0d7fd9432f9fe3e5adaa7ceac329d 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 564fcccddf4afd179118ea3efc688453d366313f..061aa74474314c64aa9028c8e952430defb77def 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 09ec4aa285bad57db27a75ad665100b40c48cc49..14e3dc66cd5a9dea7182c441968054faf4e26014 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-async-gen-private-names.js b/test/language/statements/class/fields-same-line-async-gen-private-names.js
index dc9fa95ba6c27032cf5e1dca76872dcea2b6f4d1..a1c4b00defec76e37d84e237cdc26d169197e9e7 100644
--- a/test/language/statements/class/fields-same-line-async-gen-private-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 1fef76a028fda75bbb9098c1bd122612a708bd9c..6f18630d2fd7a52373cc44f24a9657310ad0c549 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 888a4254aa7059b061d43673bfa708b1736d9489..54061a7f87a79578a6e1f57482d963b1094da718 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 d6edc9adc36f53a83f470a65ef7038e6218e968d..2040027f11c297d4f5d301d4acd9921d8fd22ee7 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-async-gen-static-private-names.js b/test/language/statements/class/fields-same-line-async-gen-static-private-names.js
index 137c63411c4bd2c67ed8e852fb4b9e82bb804954..a29c3e6ed74641d8b5d5e076d5187d226a2df427 100644
--- a/test/language/statements/class/fields-same-line-async-gen-static-private-names.js
+++ b/test/language/statements/class/fields-same-line-async-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class-fields-private, class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 dbd1e54349c4759d8415adb31eb6054a70dcea70..01a18bebd9e6865ec1851b5320007b43d0c0227e 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after an async generator in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 7019911d655c2ca60290d2500f35f0fbf0c0a050..5f51ec0c592a1b349c5f50a8f327b0f05b6be6ed 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 356272939c34bdae086eb82265f61e69553194e4..4c0e85f0bc031e81946769502392719b5f2179c5 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 38171cd761db9d1f8864a09fd827d57223f51e67..056461df1932c13b6a3a4fec1bc64b0472e6d895 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-async-method-private-names.js b/test/language/statements/class/fields-same-line-async-method-private-names.js
index be1f0562fe3e031c5d4492eb7e2686f7e022672f..5735b08153adc35396a5b29bb3f1d98204a836b5 100644
--- a/test/language/statements/class/fields-same-line-async-method-private-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 d4d24c246edc6f3f4248bfbc869ff00c9b600552..f4e8186062aea768c89fed7a1e0c052445126624 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 48c781f4eb5fbe863b448a328a8a7c9bdbd4f908..82aeb6e7107292761685c989a8d9fe955d3d383a 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 0443ffe0cb82a5d162f88233220ae42c60cabd95..2208c8cfca784658f31ced0647ef5b76251596c5 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-async-method-static-private-names.js b/test/language/statements/class/fields-same-line-async-method-static-private-names.js
index dbbc0f0303ac50bf6e9b18ecd06e3f3e96c883cc..4361e512669c6c0966466ad445cf58bccd8c7954 100644
--- a/test/language/statements/class/fields-same-line-async-method-static-private-names.js
+++ b/test/language/statements/class/fields-same-line-async-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class-fields-private, class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 cad2ee66050b9b3066270e4cff52d9cb70655b51..18986604f0fc88f6607384b10a093dd70d892d21 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions after an async method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [generated, async]
 includes: [propertyHelper.js]
 info: |
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 a8e1d6f071e11276022bf1db1ca45a443ab5a12e..d46fc2aa29b2ea20aeb77ef6c873484d090a9d8f 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 fa7d3163c7a579bc24799bfadd9234051d353632..82b5440f04752fb690ad5aca416bc272f15f74fb 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 f11e80436f4c3ff5ce23df4619c777019829c688..a473fda3f41ce247a99960cd242c87988b4ba005 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-gen-private-names.js b/test/language/statements/class/fields-same-line-gen-private-names.js
index 28322bf60a95b0170598c002192a7e0772a1c85d..435c2c8fd97f5c2a725918676da91a7898615049 100644
--- a/test/language/statements/class/fields-same-line-gen-private-names.js
+++ b/test/language/statements/class/fields-same-line-gen-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 1676f0f340053206cfba102282eb8ef0d2f1f109..1e4b9d984117c5c3d2d277ad934c8760136fa71b 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6b4f64e8b7b99d1bde80ab26b76f62b07478f952..8c2d1b4e2c7aa386e01d024f1ef5825644b3197c 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 2cbe1a6a2422ccd4183c3f5930c80d39e9632e3a..fc5215788683acff877bd479c8524689d0c9a73b 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-gen-static-private-names.js b/test/language/statements/class/fields-same-line-gen-static-private-names.js
index 6b8d2331eaf22175720ec864e567f237c564eae6..9ae9e69763d1e36f1a5b8139db0dfae651dfdc83 100644
--- a/test/language/statements/class/fields-same-line-gen-static-private-names.js
+++ b/test/language/statements/class/fields-same-line-gen-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class-fields-private, class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 11c736680abc7417427f1af6c48ec1b7207ea299..2b86174641d739d2213c1caf7c5fad72f75e420e 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a generator method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 e77aaa6a3ffdbdfc77724646d0d031646bc2c199..7157e46e1885d79e0e453a16df161263c1563a11 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 b9193c81c7c258b0a1181fee5416febd92dcacdb..ee373b465d95466a60afa96a9c07dfb648e1732e 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 5bcd714b44e16369f41c0bf17bf216ab8ae9ff0f..e3caff61aa8cfa2ebc18873e08fdd8ffb4a859b2 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-method-private-names.js b/test/language/statements/class/fields-same-line-method-private-names.js
index 92016818b74cc4186fc5b99e162aa71c3fee474c..070db9093b4304de9edfd660d4ce8fb5b69a7f84 100644
--- a/test/language/statements/class/fields-same-line-method-private-names.js
+++ b/test/language/statements/class/fields-same-line-method-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 8f4e88dd9341905c94cba976463413fea2edb380..df4668a4f0922dff6fb01c3e4b1756b47c274514 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 ecb50a7622146c8a265819be27e6e084448afe82..0c06e52cd56138dd4c31ec32b9e8b4fc9081836c 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
@@ -4,7 +4,7 @@
 /*---
 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]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 6880744140d3f14af8e45fbaa69fef27bf3a80c9..63f6a707aad090a87a6771b0ab38ea0faa66ae08 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-same-line-method-static-private-names.js b/test/language/statements/class/fields-same-line-method-static-private-names.js
index 0a862faf1ca68a34d2fa2551dca4cb79140dc717..5e8af08e08415575ee1726c4cbde89c2be7cd71f 100644
--- a/test/language/statements/class/fields-same-line-method-static-private-names.js
+++ b/test/language/statements/class/fields-same-line-method-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 2f4b901a53e9756060ae2baf4381f9c953cf44bf..50ffafe2f960854b4d28077e7ca733b5e7e8b306 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (field definitions followed by a method in the same line)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js b/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js
index d900a93f32413b3bf896e2dd3fab226f099994be..888651a8caa3e0cb6142543c9c6f34a9537c0d2f 100644
--- a/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js b/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js
index 99b7820ddf1da6981427f3a189d1b25cdddb61ee..f2cbcf1b40902692e2487e657ffffd8a9df05826 100644
--- a/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static computed ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-computed-name-toprimitive-symbol.js b/test/language/statements/class/fields-static-computed-name-toprimitive-symbol.js
index a4517c5982a26b4093e6445ce5357b7874ecc24c..4dc05f631e834e96e5ed4149915789f247388508 100644
--- a/test/language/statements/class/fields-static-computed-name-toprimitive-symbol.js
+++ b/test/language/statements/class/fields-static-computed-name-toprimitive-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, Symbol, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, Symbol, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-static-computed-name-toprimitive.js b/test/language/statements/class/fields-static-computed-name-toprimitive.js
index e9656689039cd09bfa0bcdeaf7e6b11d1a8798ee..9a98f4cf399cdcad3682bfcb1797ccfc674a7ce8 100644
--- a/test/language/statements/class/fields-static-computed-name-toprimitive.js
+++ b/test/language/statements/class/fields-static-computed-name-toprimitive.js
@@ -4,7 +4,7 @@
 /*---
 description: ToPrimitive evaluation in the ComputedPropertyName (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [computed-property-names, Symbol.toPrimitive, class-fields]
+features: [computed-property-names, Symbol.toPrimitive, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js b/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js
index d617e1f0645b8795aecb511e1af3f9e7ec8f9b73..2ab39b2d26390c3b584d4025382321746bc03312 100644
--- a/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-literal-init-err-contains-super.js b/test/language/statements/class/fields-static-literal-init-err-contains-super.js
index daf539141e3380c3e9a3244bb7206915707863ad..5cc75cff59e352a5fb7e77de1fab022be6f2b3e2 100644
--- a/test/language/statements/class/fields-static-literal-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-literal-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-private-init-err-contains-arguments.js b/test/language/statements/class/fields-static-private-init-err-contains-arguments.js
index ff0698b4db8106f756eb129447a8f55c5bdaa265..ce8be545b463cc91264719b1c50b1840cd626985 100644
--- a/test/language/statements/class/fields-static-private-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-private-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-private-init-err-contains-super.js b/test/language/statements/class/fields-static-private-init-err-contains-super.js
index 7e72af1e410497586ef6b37326ff75d959ec5bfa..d2f70f451a97d02c1ea34e024de2f30b936a72c6 100644
--- a/test/language/statements/class/fields-static-private-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-private-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static PrivateName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public, class-fields-private]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-redeclaration-symbol.js b/test/language/statements/class/fields-static-redeclaration-symbol.js
index 9c805249289d075fe65dab37026f2fd8133e06ff..0b0b7eefe798ff0b6bcabf67398ef6394fdc496b 100644
--- a/test/language/statements/class/fields-static-redeclaration-symbol.js
+++ b/test/language/statements/class/fields-static-redeclaration-symbol.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public static fields with the same name (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
diff --git a/test/language/statements/class/fields-static-redeclaration.js b/test/language/statements/class/fields-static-redeclaration.js
index f3271daecbfe240bb9c0ce31c35c1b637a410f7f..26d592b667da4776851c3f15638dbdfcc4576278 100644
--- a/test/language/statements/class/fields-static-redeclaration.js
+++ b/test/language/statements/class/fields-static-redeclaration.js
@@ -4,7 +4,7 @@
 /*---
 description: Redeclaration of public static fields with the same name (field definitions in a class declaration)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js, compareArray.js]
 info: |
diff --git a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js
index cdb9da011da20bec2c56c7bb48f278a1f4e1f2fb..2c3608db163f3255bd42d1350d30f2ab7d718750 100644
--- a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (static string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js
index 4a1f84c10b19f7c2f5fde4d9aebf14a2e835a43e..66b7e57e2ca8a2a7152ce9b0eb7e53f7f2ce126b 100644
--- a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (static string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js
index ddeae856b233032caf45e60280b1639460258471..1fdf75b474721cae16f98bad518b042e8a59ad71 100644
--- a/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js
index b92f9e8dab99e1e2119f8b72ca0e1b82fe830965..3b99f1fcf1dd401956a85f5a06b2baac8ecdecab 100644
--- a/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (string literal ClassElementName)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-string-name-propname-constructor.js b/test/language/statements/class/fields-string-name-propname-constructor.js
index 01c65d56b9a87df050a9b6f82289b52e2b878bf4..222f7622750e8afb2ebbd9462766180f923d2475 100644
--- a/test/language/statements/class/fields-string-name-propname-constructor.js
+++ b/test/language/statements/class/fields-string-name-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: class fields forbid PropName 'constructor' (early error -- PropName of StringLiteral is forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-string-name-static-propname-constructor.js b/test/language/statements/class/fields-string-name-static-propname-constructor.js
index af55e061bfd7f1b68560aaff187645dacfe96901..3ce29b208793727050c5f8d2cc8b2bd1190995fc 100644
--- a/test/language/statements/class/fields-string-name-static-propname-constructor.js
+++ b/test/language/statements/class/fields-string-name-static-propname-constructor.js
@@ -4,7 +4,7 @@
 /*---
 description: static class field forbid PropName 'constructor' (early error -- PropName of StringLiteral is forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-string-name-static-propname-prototype.js b/test/language/statements/class/fields-string-name-static-propname-prototype.js
index a8b584ddf7afedb56d5e468e373ac95bdc5a93d1..69ea7375e302692cb753de241ccc7886e5220f6a 100644
--- a/test/language/statements/class/fields-string-name-static-propname-prototype.js
+++ b/test/language/statements/class/fields-string-name-static-propname-prototype.js
@@ -4,7 +4,7 @@
 /*---
 description: static class fields forbid PropName 'prototype' (early error -- PropName of StringLiteral is forbidden value)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-ternary-init-err-contains-arguments.js b/test/language/statements/class/fields-ternary-init-err-contains-arguments.js
index af78de6bfbd12fe53a593f9045e0b40dd90956c4..7b9b9ac0a3f1dca6e4f5aa4cdc3f64cc4be465df 100644
--- a/test/language/statements/class/fields-ternary-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-ternary-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-ternary-init-err-contains-super.js b/test/language/statements/class/fields-ternary-init-err-contains-super.js
index 2fd60ab02af324c9983c59cf40c6ee7a51c104b3..f6cd257f6ed9b7d566c8b3b8bf592abe708d1c75 100644
--- a/test/language/statements/class/fields-ternary-init-err-contains-super.js
+++ b/test/language/statements/class/fields-ternary-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (ternary expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-typeof-init-err-contains-arguments.js b/test/language/statements/class/fields-typeof-init-err-contains-arguments.js
index 118db90ab3e6279406b1001cd8f60944e81e1f24..e1c929fc80aa0f00a54d54f0c0301debad3df3f0 100644
--- a/test/language/statements/class/fields-typeof-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-typeof-init-err-contains-arguments.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `arguments` used in class field (typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
diff --git a/test/language/statements/class/fields-typeof-init-err-contains-super.js b/test/language/statements/class/fields-typeof-init-err-contains-super.js
index 71896312c1054e0ac36b8776c6f6b33e500ae87a..b55231cd656dfa407596048e0e5dd993aaa93b76 100644
--- a/test/language/statements/class/fields-typeof-init-err-contains-super.js
+++ b/test/language/statements/class/fields-typeof-init-err-contains-super.js
@@ -4,7 +4,7 @@
 /*---
 description: Syntax error if `super()` used in class field (typeof expression)
 esid: sec-class-definitions-static-semantics-early-errors
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 negative:
   phase: early
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 b9976d643b24989ba391fae870979691f821f52d..5569e5e4fb6593a802a1693701658eaea4f4d95e 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 e7991f3cf650a5a57eb4c0e5cde50cfc6bccd97e..cef596bb745538ea535509a694aa95eec778dc3d 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
@@ -4,7 +4,7 @@
 /*---
 description: Computed property symbol names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 cf6e06cd4cc20f41d81a6627aff75a238ab6a9c8..caf9edbe98074729c74abd26a5c5d91233a897c5 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
@@ -4,7 +4,7 @@
 /*---
 description: Literal property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-wrapped-in-sc-private-names.js b/test/language/statements/class/fields-wrapped-in-sc-private-names.js
index 7732901b6765dc9990f17117abe939a03801a108..440650c8323740c5155859d7f1dbf8aba36a9e3c 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-private-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: static literal private names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 aca693dc479b420344d756365d591d2981c96bc9..e0b48ea721de120a296a32695b027f16de5d8d01 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
@@ -4,7 +4,7 @@
 /*---
 description: Static Computed property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [computed-property-names, class-fields]
+features: [computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 3ba23c0da6a4d5ab079331cea899429bd0178759..6ad4e2161945bf8dd08e896d4d66bd7881aa8d81 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
@@ -4,7 +4,7 @@
 /*---
 description: Static computed property symbol names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [Symbol, computed-property-names, class-fields]
+features: [Symbol, computed-property-names, class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
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 1213491703c541a2e9337dc6d642aa79156ad053..4ceef4485c3209938b34c8580a546853ef977d7e 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
@@ -4,7 +4,7 @@
 /*---
 description: Static literal property names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |
diff --git a/test/language/statements/class/fields-wrapped-in-sc-static-private-names.js b/test/language/statements/class/fields-wrapped-in-sc-static-private-names.js
index cba691dc1ce8d7162d2cb209c15e9ce3aec911c6..2238a0c10c139d83b064dd8296d85e1ca329cdb1 100644
--- a/test/language/statements/class/fields-wrapped-in-sc-static-private-names.js
+++ b/test/language/statements/class/fields-wrapped-in-sc-static-private-names.js
@@ -4,7 +4,7 @@
 /*---
 description: literal private names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class-fields-private, class, class-fields-public]
 flags: [generated]
 info: |
     ClassElement:
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 fb29419490c38191d52da6b86a15989d10b314ad..e1ba62e97060ea1d97fc6015e47ce227e4a886b1 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
@@ -4,7 +4,7 @@
 /*---
 description: String literal names (fields definition wrapped in semicolons)
 esid: prod-FieldDefinition
-features: [class-fields]
+features: [class, class-fields-public]
 flags: [generated]
 includes: [propertyHelper.js]
 info: |