Add features for class public fields

50 files changed, 50 insertions, 50 deletions

diff --git a/src/class-fields/class-evaluation-error/cls-decl.template b/src/class-fields/class-evaluation-error/cls-decl.template
index 2b141c930..6a77134e1 100644
--- a/src/class-fields/class-evaluation-error/cls-decl.template
+++ b/src/class-fields/class-evaluation-error/cls-decl.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-evaluation-error-
 name: field definitions in a class declaration
-features: [class-fields]
+features: [class, class-fields-public]
 esid: sec-runtime-semantics-classdefinitionevaluation
 ---*/
 
diff --git a/src/class-fields/class-evaluation-error/cls-expr.template b/src/class-fields/class-evaluation-error/cls-expr.template
index d7cf4339a..55735b597 100644
--- a/src/class-fields/class-evaluation-error/cls-expr.template
+++ b/src/class-fields/class-evaluation-error/cls-expr.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-evaluation-error-
 name: field definitions in a class expression
-features: [class-fields]
+features: [class, class-fields-public]
 esid: sec-runtime-semantics-classdefinitionevaluation
 ---*/
 
diff --git a/src/class-fields/default/cls-decl.template b/src/class-fields/default/cls-decl.template
index e46471f6a..8acd1452b 100644
--- a/src/class-fields/default/cls-decl.template
+++ b/src/class-fields/default/cls-decl.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-
 name: field definitions in a class declaration
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/default/cls-expr.template b/src/class-fields/default/cls-expr.template
index 5b22f06c8..1ea8cc02e 100644
--- a/src/class-fields/default/cls-expr.template
+++ b/src/class-fields/default/cls-expr.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-
 name: field definitions in a class expression
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-arguments.case b/src/class-fields/eval-err-contains-arguments.case
index f9a6f6345..9f3b661fd 100644
--- a/src/class-fields/eval-err-contains-arguments.case
+++ b/src/class-fields/eval-err-contains-arguments.case
@@ -17,7 +17,7 @@ info: |
     1. If the StringValue of Identifier is "arguments", return true.
     ...
     For all other grammatical productions, recurse on all nonterminals. If any piece returns true, then return true. Otherwise return false.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-arguments
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-newtarget.case b/src/class-fields/eval-err-contains-newtarget.case
index 65ab504e4..28688867a 100644
--- a/src/class-fields/eval-err-contains-newtarget.case
+++ b/src/class-fields/eval-err-contains-newtarget.case
@@ -16,7 +16,7 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains NewTarget.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-newtarget
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-supercall-1.case b/src/class-fields/eval-err-contains-supercall-1.case
index 7be53f942..27469abd5 100644
--- a/src/class-fields/eval-err-contains-supercall-1.case
+++ b/src/class-fields/eval-err-contains-supercall-1.case
@@ -16,7 +16,7 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains SuperCall.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-super-call
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-supercall-2.case b/src/class-fields/eval-err-contains-supercall-2.case
index d0c9e3449..cdddc7791 100644
--- a/src/class-fields/eval-err-contains-supercall-2.case
+++ b/src/class-fields/eval-err-contains-supercall-2.case
@@ -16,7 +16,7 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains SuperCall.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-super-call
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-supercall.case b/src/class-fields/eval-err-contains-supercall.case
index b6370bc13..55e7f213f 100644
--- a/src/class-fields/eval-err-contains-supercall.case
+++ b/src/class-fields/eval-err-contains-supercall.case
@@ -16,7 +16,7 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains SuperCall.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-super-call
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-superproperty-1.case b/src/class-fields/eval-err-contains-superproperty-1.case
index 0d9a2d3a5..9241e3a1c 100644
--- a/src/class-fields/eval-err-contains-superproperty-1.case
+++ b/src/class-fields/eval-err-contains-superproperty-1.case
@@ -16,7 +16,7 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains SuperProperty.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-super-property
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-superproperty-2.case b/src/class-fields/eval-err-contains-superproperty-2.case
index 7840bdb77..f770e42cd 100644
--- a/src/class-fields/eval-err-contains-superproperty-2.case
+++ b/src/class-fields/eval-err-contains-superproperty-2.case
@@ -16,7 +16,7 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains SuperProperty.
-features: [class-fields]
+features: [class, class-fields-public]
 template: initializer-eval-super-property
 ---*/
 
diff --git a/src/class-fields/init-err-contains-arguments.case b/src/class-fields/init-err-contains-arguments.case
index 605cdd32d..d6c2b6d7e 100644
--- a/src/class-fields/init-err-contains-arguments.case
+++ b/src/class-fields/init-err-contains-arguments.case
@@ -17,7 +17,7 @@ info: |
     1. If the StringValue of Identifier is "arguments", return true.
     ...
     For all other grammatical productions, recurse on all nonterminals. If any piece returns true, then return true. Otherwise return false.
-features: [class-fields]
+features: [class, class-fields-public]
 negative:
   type: SyntaxError
   phase: early
diff --git a/src/class-fields/init-err-contains-super.case b/src/class-fields/init-err-contains-super.case
index 49aa3c9bf..29a141ef2 100644
--- a/src/class-fields/init-err-contains-super.case
+++ b/src/class-fields/init-err-contains-super.case
@@ -10,7 +10,7 @@ info: |
       PropertyNameInitializeropt
 
     - It is a Syntax Error if Initializer is present and Initializer Contains SuperCall is true.
-features: [class-fields]
+features: [class, class-fields-public]
 negative:
   type: SyntaxError
   phase: early
diff --git a/src/class-fields/productions/cls-decl-after-same-line-async-gen.template b/src/class-fields/productions/cls-decl-after-same-line-async-gen.template
index 81d3548cf..7f6370a8f 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-async-gen.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-async-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-same-line-async-gen-
 name: field definitions after an async generator in the same line
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-decl-after-same-line-async-method.template b/src/class-fields/productions/cls-decl-after-same-line-async-method.template
index 62b48966f..3f27b16f3 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-async-method.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-async-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-same-line-async-method-
 name: field definitions after an async method in the same line
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-decl-after-same-line-gen.template b/src/class-fields/productions/cls-decl-after-same-line-gen.template
index 7ca401a7c..685e9a932 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-gen.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-gen-
 name: field definitions after a generator in the same line
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-after-same-line-method.template b/src/class-fields/productions/cls-decl-after-same-line-method.template
index ab59c5bb9..03c468685 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-method.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-method-
 name: field definitions after a method in the same line
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-after-same-line-static-async-gen.template b/src/class-fields/productions/cls-decl-after-same-line-static-async-gen.template
index 68d9687cd..4e9a9bbe9 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-static-async-gen.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-static-async-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-static-async-gen-
 name: field definitions after a static async generator in the same line
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-decl-after-same-line-static-async-method.template b/src/class-fields/productions/cls-decl-after-same-line-static-async-method.template
index 5b5bb56a1..df3ff3aca 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-static-async-method.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-static-async-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-static-async-method-
 name: field definitions after a static async method in the same line
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-decl-after-same-line-static-gen.template b/src/class-fields/productions/cls-decl-after-same-line-static-gen.template
index 1c9137c27..68e5251f0 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-static-gen.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-static-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-static-gen-
 name: field definitions after a static generator in the same line
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-after-same-line-static-method.template b/src/class-fields/productions/cls-decl-after-same-line-static-method.template
index 2d1351265..cce75d172 100644
--- a/src/class-fields/productions/cls-decl-after-same-line-static-method.template
+++ b/src/class-fields/productions/cls-decl-after-same-line-static-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-static-method-
 name: field definitions after a static method in the same line
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-multiple-definitions.template b/src/class-fields/productions/cls-decl-multiple-definitions.template
index 583c8f377..a64f7bc53 100644
--- a/src/class-fields/productions/cls-decl-multiple-definitions.template
+++ b/src/class-fields/productions/cls-decl-multiple-definitions.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-multiple-definitions-
 name: multiple fields definitions
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-multiple-stacked-definitions.template b/src/class-fields/productions/cls-decl-multiple-stacked-definitions.template
index 7c95c62ff..e65c65475 100644
--- a/src/class-fields/productions/cls-decl-multiple-stacked-definitions.template
+++ b/src/class-fields/productions/cls-decl-multiple-stacked-definitions.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-multiple-stacked-definitions-
 name: multiple stacked fields definitions through ASI
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-new-no-sc-line-method.template b/src/class-fields/productions/cls-decl-new-no-sc-line-method.template
index 630d9c51e..bc7bedf15 100644
--- a/src/class-fields/productions/cls-decl-new-no-sc-line-method.template
+++ b/src/class-fields/productions/cls-decl-new-no-sc-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-new-no-sc-line-method-
 name: field definitions followed by a method in a new line without a semicolon
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-new-sc-line-generator.template b/src/class-fields/productions/cls-decl-new-sc-line-generator.template
index b347c09b9..3ae2f7eba 100644
--- a/src/class-fields/productions/cls-decl-new-sc-line-generator.template
+++ b/src/class-fields/productions/cls-decl-new-sc-line-generator.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-new-sc-line-gen-
 name: field definitions followed by a method in a new line with a semicolon
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-new-sc-line-method.template b/src/class-fields/productions/cls-decl-new-sc-line-method.template
index 4f714e29f..1bdd2ab6f 100644
--- a/src/class-fields/productions/cls-decl-new-sc-line-method.template
+++ b/src/class-fields/productions/cls-decl-new-sc-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-new-sc-line-method-
 name: field definitions followed by a method in a new line with a semicolon
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-regular-definitions.template b/src/class-fields/productions/cls-decl-regular-definitions.template
index 4ccdd76f7..870e20b98 100644
--- a/src/class-fields/productions/cls-decl-regular-definitions.template
+++ b/src/class-fields/productions/cls-decl-regular-definitions.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-regular-definitions-
 name: regular fields defintion
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/productions/cls-decl-same-line-generator.template b/src/class-fields/productions/cls-decl-same-line-generator.template
index 420268b69..467e259d8 100644
--- a/src/class-fields/productions/cls-decl-same-line-generator.template
+++ b/src/class-fields/productions/cls-decl-same-line-generator.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-same-line-gen-
 name: field definitions followed by a generator method in the same line
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-same-line-method.template b/src/class-fields/productions/cls-decl-same-line-method.template
index 3b1be5f58..7b1bd68ce 100644
--- a/src/class-fields/productions/cls-decl-same-line-method.template
+++ b/src/class-fields/productions/cls-decl-same-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-same-line-method-
 name: field definitions followed by a method in the same line
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-decl-wrapped-in-sc.template b/src/class-fields/productions/cls-decl-wrapped-in-sc.template
index b76403262..ccccf51d7 100644
--- a/src/class-fields/productions/cls-decl-wrapped-in-sc.template
+++ b/src/class-fields/productions/cls-decl-wrapped-in-sc.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-wrapped-in-sc-
 name: fields definition wrapped in semicolons
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/productions/cls-expr-after-same-line-async-gen.template b/src/class-fields/productions/cls-expr-after-same-line-async-gen.template
index a86b3256a..410d8abd6 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-async-gen.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-async-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-same-line-async-gen-
 name: field definitions after an async generator in the same line
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-expr-after-same-line-async-method.template b/src/class-fields/productions/cls-expr-after-same-line-async-method.template
index f1a0f2695..60b81cb59 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-async-method.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-async-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-same-line-async-method-
 name: field definitions after an async method in the same line
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-expr-after-same-line-gen.template b/src/class-fields/productions/cls-expr-after-same-line-gen.template
index 1434038df..8231e3eea 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-gen.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-gen-
 name: field definitions after a generator in the same line
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-after-same-line-method.template b/src/class-fields/productions/cls-expr-after-same-line-method.template
index 9f25e8b48..5ea97ad69 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-method.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-method-
 name: field definitions after a method in the same line
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-after-same-line-static-async-gen.template b/src/class-fields/productions/cls-expr-after-same-line-static-async-gen.template
index bda88adcc..26df25c71 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-static-async-gen.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-static-async-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-static-async-gen-
 name: field definitions after a static async generator in the same line
-features: [class-fields, async-iteration]
+features: [class, class-fields-public, async-iteration]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-expr-after-same-line-static-async-method.template b/src/class-fields/productions/cls-expr-after-same-line-static-async-method.template
index f9e61dc7f..84dad3928 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-static-async-method.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-static-async-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-static-async-method-
 name: field definitions after a static async method in the same line
-features: [class-fields, async-functions]
+features: [class, class-fields-public, async-functions]
 flags: [async]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
diff --git a/src/class-fields/productions/cls-expr-after-same-line-static-gen.template b/src/class-fields/productions/cls-expr-after-same-line-static-gen.template
index 278275a30..9d9c31470 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-static-gen.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-static-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-static-gen-
 name: field definitions after a static generator in the same line
-features: [generators, class-fields]
+features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-after-same-line-static-method.template b/src/class-fields/productions/cls-expr-after-same-line-static-method.template
index 2b6f3e4dd..922c449ff 100644
--- a/src/class-fields/productions/cls-expr-after-same-line-static-method.template
+++ b/src/class-fields/productions/cls-expr-after-same-line-static-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-static-method-
 name: field definitions after a static method in the same line
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-multiple-definitions.template b/src/class-fields/productions/cls-expr-multiple-definitions.template
index 00c2175eb..c94b5255d 100644
--- a/src/class-fields/productions/cls-expr-multiple-definitions.template
+++ b/src/class-fields/productions/cls-expr-multiple-definitions.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-multiple-definitions-
 name: multiple fields definitions
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-multiple-stacked-definitions.template b/src/class-fields/productions/cls-expr-multiple-stacked-definitions.template
index dd920d97e..8184c8805 100644
--- a/src/class-fields/productions/cls-expr-multiple-stacked-definitions.template
+++ b/src/class-fields/productions/cls-expr-multiple-stacked-definitions.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-multiple-stacked-definitions-
 name: multiple stacked fields definitions through ASI
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-new-no-sc-line-method.template b/src/class-fields/productions/cls-expr-new-no-sc-line-method.template
index 320f62682..f0269c0f4 100644
--- a/src/class-fields/productions/cls-expr-new-no-sc-line-method.template
+++ b/src/class-fields/productions/cls-expr-new-no-sc-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-new-no-sc-line-method-
 name: field definitions followed by a method in a new line without a semicolon
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-new-sc-line-generator.template b/src/class-fields/productions/cls-expr-new-sc-line-generator.template
index e956c11b6..34d080e3f 100644
--- a/src/class-fields/productions/cls-expr-new-sc-line-generator.template
+++ b/src/class-fields/productions/cls-expr-new-sc-line-generator.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-new-sc-line-gen-
 name: field definitions followed by a method in a new line with a semicolon
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-new-sc-line-method.template b/src/class-fields/productions/cls-expr-new-sc-line-method.template
index 8be8ce2ed..e604e4ee6 100644
--- a/src/class-fields/productions/cls-expr-new-sc-line-method.template
+++ b/src/class-fields/productions/cls-expr-new-sc-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-new-sc-line-method-
 name: field definitions followed by a method in a new line with a semicolon
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-regular-definitions.template b/src/class-fields/productions/cls-expr-regular-definitions.template
index 630c04f41..3f1665d00 100644
--- a/src/class-fields/productions/cls-expr-regular-definitions.template
+++ b/src/class-fields/productions/cls-expr-regular-definitions.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-regular-definitions-
 name: regular fields defintion
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/productions/cls-expr-same-line-generator.template b/src/class-fields/productions/cls-expr-same-line-generator.template
index 286d60af3..ca1fcdc8b 100644
--- a/src/class-fields/productions/cls-expr-same-line-generator.template
+++ b/src/class-fields/productions/cls-expr-same-line-generator.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-same-line-gen-
 name: field definitions followed by a generator method in the same line
-features: [class-fields, generators]
+features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-same-line-method.template b/src/class-fields/productions/cls-expr-same-line-method.template
index d565e5c5e..78eee3d86 100644
--- a/src/class-fields/productions/cls-expr-same-line-method.template
+++ b/src/class-fields/productions/cls-expr-same-line-method.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-same-line-method-
 name: field definitions followed by a method in the same line
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 includes: [propertyHelper.js]
 ---*/
diff --git a/src/class-fields/productions/cls-expr-wrapped-in-sc.template b/src/class-fields/productions/cls-expr-wrapped-in-sc.template
index 4f7397057..ff2780e2b 100644
--- a/src/class-fields/productions/cls-expr-wrapped-in-sc.template
+++ b/src/class-fields/productions/cls-expr-wrapped-in-sc.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-wrapped-in-sc-
 name: fields definition wrapped in semicolons
-features: [class-fields]
+features: [class, class-fields-public]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/propname-constructor.case b/src/class-fields/propname-constructor.case
index 3353606dd..5254d7bf9 100644
--- a/src/class-fields/propname-constructor.case
+++ b/src/class-fields/propname-constructor.case
@@ -10,7 +10,7 @@ info: |
 
     ClassElement : FieldDefinition;
       It is a Syntax Error if PropName of FieldDefinition is "constructor".
-features: [class-fields]
+features: [class, class-fields-public]
 template: propname-error
 ---*/
 
diff --git a/src/class-fields/static-propname-constructor.case b/src/class-fields/static-propname-constructor.case
index b76be8ebb..3f3c845fc 100644
--- a/src/class-fields/static-propname-constructor.case
+++ b/src/class-fields/static-propname-constructor.case
@@ -10,7 +10,7 @@ info: |
 
     ClassElement : staticFieldDefinition;
       It is a Syntax Error if PropName of FieldDefinition is "prototype" or "constructor".
-features: [class-fields]
+features: [class, class-fields-public]
 template: propname-error-static
 ---*/
 
diff --git a/src/class-fields/static-propname-prototype.case b/src/class-fields/static-propname-prototype.case
index 30911e943..0a514572e 100644
--- a/src/class-fields/static-propname-prototype.case
+++ b/src/class-fields/static-propname-prototype.case
@@ -10,7 +10,7 @@ info: |
 
     ClassElement : staticFieldDefinition;
       It is a Syntax Error if PropName of FieldDefinition is "prototype" or "constructor".
-features: [class-fields]
+features: [class, class-fields-public]
 template: propname-error-static
 ---*/