diff --git a/src/class-fields/computed-name-empty-var-computed-name-empty-function.case b/src/class-fields/computed-name-empty-var-computed-name-empty-function.case
deleted file mode 100644
index a6aed9f894073bc2ebf1ad2f627a2a25c4ea61d5..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-computed-name-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var not initialized, computed name function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']; ['b'](){}
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-empty-var-empty-function.case b/src/class-fields/computed-name-empty-var-empty-function.case
deleted file mode 100644
index 5feacdca35e6a0b3b2191528e8a39738c96b8023..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var not initialized, empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']; b(){}
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-empty-var-empty-var.case b/src/class-fields/computed-name-empty-var-empty-var.case
deleted file mode 100644
index af98e9c968f961e9aaf705029e205a719457881f..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-empty-var.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var not initialized, var not initialized
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']; b
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/computed-name-empty-var-generator-empty-function.case b/src/class-fields/computed-name-empty-var-generator-empty-function.case
deleted file mode 100644
index 39a1de7de144158337c5c028e814fce2f295bf6d..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-generator-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var not initialized, generator empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']; *b(){}
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-empty-var-new-line-asi.case b/src/class-fields/computed-name-empty-var-new-line-asi.case
deleted file mode 100644
index 84e9e7d06f5b0c85030780e47b7230e7b12f828f..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-new-line-asi.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name empty var and newline (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/computed-name-empty-var-new-line-computed-name-empty-function-asi.case b/src/class-fields/computed-name-empty-var-new-line-computed-name-empty-function-asi.case
deleted file mode 100644
index 93d034fad2a25551223d708198de57ec8ba14f72..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-new-line-computed-name-empty-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name empty var and newline, computed name empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']
-  ['b'](){}
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-empty-var-new-line-empty-function-asi.case b/src/class-fields/computed-name-empty-var-new-line-empty-function-asi.case
deleted file mode 100644
index d908715a16dd77d977e183a7687a5bb2c6a7d1e8..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-new-line-empty-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name empty var and newline, empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']
-  b(){}
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-empty-var-new-line-empty-var-asi.case b/src/class-fields/computed-name-empty-var-new-line-empty-var-asi.case
deleted file mode 100644
index 139ac66ee2f6100b69e8465cfbcf52842484fa48..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-new-line-empty-var-asi.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name empty var and newline, empty var (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']
-  b
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/computed-name-empty-var-new-line-generator-empty-function-asi.case b/src/class-fields/computed-name-empty-var-new-line-generator-empty-function-asi.case
deleted file mode 100644
index f5cbdbc62f7c7c71c510302c6f3c845f4d59d970..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var-new-line-generator-empty-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name empty var and newline, generator empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a']
-  *b(){}
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-empty-var.case b/src/class-fields/computed-name-empty-var.case
deleted file mode 100644
index 5a2c3b0e4798946adda5bb9650c2a1dbc7406b2c..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-empty-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var not initialized
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'];
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/computed-name-zero-initializer-new-line-empty-bar-asi.case b/src/class-fields/computed-name-zero-initializer-new-line-empty-bar-asi.case
deleted file mode 100644
index 76cfe5ab44fd791a85a4035f5aac19629e73026d..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-new-line-empty-bar-asi.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name zero initialized var and newline, empty var (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0
-  b
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/computed-name-zero-initializer-new-line-empty-function-asi.case b/src/class-fields/computed-name-zero-initializer-new-line-empty-function-asi.case
deleted file mode 100644
index ea66279a768c9d5dc41fbfb5eeef1c518cd94581..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-new-line-empty-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name zero initialized var and newline, empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0
-  b(){}
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-zero-initializer-new-line-empty-var-asi.case b/src/class-fields/computed-name-zero-initializer-new-line-empty-var-asi.case
deleted file mode 100644
index 76cfe5ab44fd791a85a4035f5aac19629e73026d..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-new-line-empty-var-asi.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name zero initialized var and newline, empty var (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0
-  b
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/computed-name-zero-initializer-var-computed-name-empty-function.case b/src/class-fields/computed-name-zero-initializer-var-computed-name-empty-function.case
deleted file mode 100644
index 58a136c039335eecac9cfbd376140a852f81e709..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-var-computed-name-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var zero initialized, computed name empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0; ['b'](){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-zero-initializer-var-empty-function.case b/src/class-fields/computed-name-zero-initializer-var-empty-function.case
deleted file mode 100644
index 9b11074b7c13eb28dc2f6b4c2ad26dabb500df24..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-var-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var zero initialized, empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0; b(){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-zero-initializer-var-empty-var.case b/src/class-fields/computed-name-zero-initializer-var-empty-var.case
deleted file mode 100644
index 5653b8d5b98bced3e347e55c99b1b3f8dcf1b60e..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-var-empty-var.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var zero initialized, empty var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0; b
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/computed-name-zero-initializer-var-generator-empty-function.case b/src/class-fields/computed-name-zero-initializer-var-generator-empty-function.case
deleted file mode 100644
index c4ac672307f5d531c66677d043a631d84eca5d53..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-var-generator-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var zero initialized, generator empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0; *b(){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/computed-name-zero-initializer-var-new-line-asi.case b/src/class-fields/computed-name-zero-initializer-var-new-line-asi.case
deleted file mode 100644
index 8fe58c0be381b1ccc65035562cb9fa28cecee8e5..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-var-new-line-asi.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: computed name zero initialized var and newline (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/computed-name-zero-initializer-var.case b/src/class-fields/computed-name-zero-initializer-var.case
deleted file mode 100644
index c2dc168eb728f0d486d6956086bd4a2f9f37cda2..0000000000000000000000000000000000000000
--- a/src/class-fields/computed-name-zero-initializer-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Computed name var zero initialized
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  ['a'] = 0;
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/default/cls-decl-extends.template b/src/class-fields/default/cls-decl-extends.template
deleted file mode 100644
index 2cc6dd63f4351e699246c2347a5f16dce94f8889..0000000000000000000000000000000000000000
--- a/src/class-fields/default/cls-decl-extends.template
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-path: language/expressions/class/class-field-extends-
-name: class fields
----*/
-
-class Base {}
-class C extends Base {
-  /*{ body }*/
-  constructor() {
-    super();
-    /*{ assertions }*/
-  }
-}
-
-const c = new C();
diff --git a/src/class-fields/default/cls-decl.template b/src/class-fields/default/cls-decl.template
deleted file mode 100644
index 92dcfd74e3f433289a86883a5a1795ebc2471fa4..0000000000000000000000000000000000000000
--- a/src/class-fields/default/cls-decl.template
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-path: language/expressions/class/class-field-
-name: class fields
----*/
-
-class C {
-  /*{ body }*/
-  constructor() {
-    /*{ assertions }*/
-  }
-}
-
-const c = new C();
diff --git a/src/class-fields/double-empty-var.case b/src/class-fields/double-empty-var.case
deleted file mode 100644
index 6da7714490dfe19cf7001e93473bac6577c7f63c..0000000000000000000000000000000000000000
--- a/src/class-fields/double-empty-var.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Empty var, empty var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a; b;
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/empty-string-var.case b/src/class-fields/empty-string-var.case
deleted file mode 100644
index 86666052ff2a73b86af2327f366bc22c10301ca3..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-string-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Empty string var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  'a';
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/empty-var-computed-name-empty-function.case b/src/class-fields/empty-var-computed-name-empty-function.case
deleted file mode 100644
index 3a56f21796cded65d0c6a392e8ced12bd07d85db..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-computed-name-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: empty var, computed name empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a; ['b'](){}
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/empty-var-empty-function.case b/src/class-fields/empty-var-empty-function.case
deleted file mode 100644
index 43b39b27c2b15215f9f5f17777426527ae088a93..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Empty var, empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a; b(){}
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/empty-var-generator-empty-function.case b/src/class-fields/empty-var-generator-empty-function.case
deleted file mode 100644
index a9f86fa45588b34ecb6cf9c4e24db7a69bb84f52..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-generator-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Empty var, generator empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a; *b(){}
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/empty-var-new-line-asi.case b/src/class-fields/empty-var-new-line-asi.case
deleted file mode 100644
index 0c68ce995b4ceb1324bf108edd8e2a7311953aa9..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-new-line-asi.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: empty var and newline (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/empty-var-new-line-computed-name-function-asi.case b/src/class-fields/empty-var-new-line-computed-name-function-asi.case
deleted file mode 100644
index fe9551455e0cb65667e12402cb79e48cf9328f65..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-new-line-computed-name-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: empty var and newline, computed name empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a
-  ['b'](){}
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/empty-var-new-line-empty-function-asi.case b/src/class-fields/empty-var-new-line-empty-function-asi.case
deleted file mode 100644
index 7002cab0c0002be9de364c391de12ebd3fad7a17..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-new-line-empty-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: empty var and newline, empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a
-  b(){}
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/empty-var-new-line-empty-var-new-line-asi.case b/src/class-fields/empty-var-new-line-empty-var-new-line-asi.case
deleted file mode 100644
index c58ef2756043be23d839159e8d7bbabb768a5c9a..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-new-line-empty-var-new-line-asi.case
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: empty var and newline, empty var and newline (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a
-  b
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/empty-var-new-line-generator-empty-function-asi.case b/src/class-fields/empty-var-new-line-generator-empty-function-asi.case
deleted file mode 100644
index 816bb591b9358d3c7f928152d057f0a66085dddb..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var-new-line-generator-empty-function-asi.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: empty var and newline, generator empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a
-  *b(){}
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/empty-var.case b/src/class-fields/empty-var.case
deleted file mode 100644
index 43392b65b4c2938d3b14cd49d318c021d406847c..0000000000000000000000000000000000000000
--- a/src/class-fields/empty-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Empty var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a;
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/string-zero-initializer-var.case b/src/class-fields/string-zero-initializer-var.case
deleted file mode 100644
index a6ab7c7f8f643bdab14d2804dc7994634720c7bd..0000000000000000000000000000000000000000
--- a/src/class-fields/string-zero-initializer-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: string var zero initializer
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  'a' = 0;
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/undefined-initializer-var.case b/src/class-fields/undefined-initializer-var.case
deleted file mode 100644
index 391bdb3eec39b999378c588030c4a323053be13e..0000000000000000000000000000000000000000
--- a/src/class-fields/undefined-initializer-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Empty var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = undefined;
-
-//- assertions
-  assert.sameValue(this.a, undefined);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/yield-var.case b/src/class-fields/yield-var.case
deleted file mode 100644
index abc30f2fe770dd5d211080e92ff95e91484e4640..0000000000000000000000000000000000000000
--- a/src/class-fields/yield-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: yield var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  yield
-
-//- assertions
-  assert.sameValue(this.yield, undefined);
-  verifyEnumerable(this, "yield");
-  verifyWritable(this, "yield");
-  verifyConfigurable(this, "yield");
diff --git a/src/class-fields/yield-zero-initializer-var.case b/src/class-fields/yield-zero-initializer-var.case
deleted file mode 100644
index e677466bf6e352109e4316b5495cf3926692ebb6..0000000000000000000000000000000000000000
--- a/src/class-fields/yield-zero-initializer-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: yield var zero initialized
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  yield = 0
-
-//- assertions
-  assert.sameValue(this.yield, 0);
-  verifyEnumerable(this, "yield");
-  verifyWritable(this, "yield");
-  verifyConfigurable(this, "yield");
diff --git a/src/class-fields/zero-empty-var.case b/src/class-fields/zero-empty-var.case
deleted file mode 100644
index ae2135648403512c8a6904c1749da1cc00ed6677..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-empty-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  0;
-
-//- assertions
-  assert.sameValue(this["0"], undefined);
-  verifyEnumerable(this, "0");
-  verifyWritable(this, "0");
-  verifyConfigurable(this, "0");
diff --git a/src/class-fields/zero-initializer-var-computed-name-empty-function.case b/src/class-fields/zero-initializer-var-computed-name-empty-function.case
deleted file mode 100644
index 195626c747321e1738e44fd49dc90864eb2f0d0b..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-computed-name-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var, computed name empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0; ['b'](){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/zero-initializer-var-empty-function.case b/src/class-fields/zero-initializer-var-empty-function.case
deleted file mode 100644
index d6033029c0430e147571208b25589bbb8d84fafa..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var, empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0; b(){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/zero-initializer-var-empty-var.case b/src/class-fields/zero-initializer-var-empty-var.case
deleted file mode 100644
index 93a7940950e6ce77de6b155dd9f0e73d41372994..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-empty-var.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var, empty var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0; b
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/zero-initializer-var-generator-empty-function.case b/src/class-fields/zero-initializer-var-generator-empty-function.case
deleted file mode 100644
index 688d24e60131749b6f078f259487dd8ac971b227..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-generator-empty-function.case
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var, generator empty function
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0; *b(){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/zero-initializer-var-new-line-asi.case b/src/class-fields/zero-initializer-var-new-line-asi.case
deleted file mode 100644
index f4144acf0019100e663b1a0a7c87f0b9a4f1289d..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-new-line-asi.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var and newline (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/zero-initializer-var-new-line-empty-function-asi.case b/src/class-fields/zero-initializer-var-new-line-empty-function-asi.case
deleted file mode 100644
index 8a3c24a85692dac77ebee11c7745daa45daa360b..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-new-line-empty-function-asi.case
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var and newline, empty function (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0
-  b(){}
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(typeof Object.getPrototypeOf(this).b, "function");
-  verifyNotEnumerable(Object.getPrototypeOf(this), "b");
-  verifyConfigurable(Object.getPrototypeOf(this), "b");
diff --git a/src/class-fields/zero-initializer-var-new-line-empty-var-asi.case b/src/class-fields/zero-initializer-var-new-line-empty-var-asi.case
deleted file mode 100644
index 46c13df9244b9550405057402ce26e70d29a1b41..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var-new-line-empty-var-asi.case
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var and newline, empty var (ASI)
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0
-  b
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
-
-  assert.sameValue(this.b, undefined);
-  verifyEnumerable(this, "b");
-  verifyWritable(this, "b");
-  verifyConfigurable(this, "b");
diff --git a/src/class-fields/zero-initializer-var.case b/src/class-fields/zero-initializer-var.case
deleted file mode 100644
index b2f10211cc940cea320899a4f42b859972dd4a0c..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-initializer-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  a = 0;
-
-//- assertions
-  assert.sameValue(this.a, 0);
-  verifyEnumerable(this, "a");
-  verifyWritable(this, "a");
-  verifyConfigurable(this, "a");
diff --git a/src/class-fields/zero-zero-initializer-var.case b/src/class-fields/zero-zero-initializer-var.case
deleted file mode 100644
index 64ad15f903c80f8d499e56a9d7eb8d5666c7bee1..0000000000000000000000000000000000000000
--- a/src/class-fields/zero-zero-initializer-var.case
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors, 2017 Igalia S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: zero initialized zero var
-info: |
-  1.1 New Productions
-
-  [...]
-
-  FieldDefinitionList [Yield, Await]:
-    FieldDefinition [?Yield, ?Await]
-    FieldDefinitionList  [?Yield, ?Await], FieldDefinition [?Yield, ?Await]
-template: default
-includes: [propertyHelper.js]
----*/
-
-//- body
-  0 = 0;
-
-//- assertions
-  assert.sameValue(this["0"], 0);
-  verifyEnumerable(this, "0");
-  verifyWritable(this, "0");
-  verifyConfigurable(this, "0");