diff --git a/src/class-fields/computed-names.case b/src/class-fields/computed-names.case
index fcfaf53219ad65e5eb1ab572fa23afc2546a0080..fc99050d6b53c74a01af3a0f449d846aba3a1b3a 100644
--- a/src/class-fields/computed-names.case
+++ b/src/class-fields/computed-names.case
@@ -63,7 +63,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "not initialized"), fal
 assert.sameValue(Object.hasOwnProperty.call(C, "not initialized"), false);
 
 verifyProperty(c, "not initialized", {
-  value: "meep",
+  value: undefined,
   enumerable: true,
   writable: true,
   configurable: true
diff --git a/src/class-fields/default/cls-decl-after-same-line-async-gen.template b/src/class-fields/default/cls-decl-after-same-line-async-gen.template
index 49983da696ca3a2f91190f8340d49b03e7c4db07..b30c14785d564c3d7c12ea65658f202d0bd9158e 100644
--- a/src/class-fields/default/cls-decl-after-same-line-async-gen.template
+++ b/src/class-fields/default/cls-decl-after-same-line-async-gen.template
@@ -21,10 +21,11 @@ verifyProperty(C.prototype, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
 c.m().next().then(function(v) {
-  assert.sameValue(v, 42);
+  assert.sameValue(v.value, 42);
+  assert.sameValue(v.done, true);
 }, $DONE).then($DONE, $DONE);
diff --git a/src/class-fields/default/cls-decl-after-same-line-async-method.template b/src/class-fields/default/cls-decl-after-same-line-async-method.template
index a261640ddfbc52335108f37f4f8b314d963ac070..b494494da5eb75bbb205699c259b50cf3a0c0e95 100644
--- a/src/class-fields/default/cls-decl-after-same-line-async-method.template
+++ b/src/class-fields/default/cls-decl-after-same-line-async-method.template
@@ -21,7 +21,7 @@ verifyProperty(C.prototype, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
diff --git a/src/class-fields/default/cls-decl-after-same-line-static-async-gen.template b/src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
index 5d5ad3f3e6b60f6354a7998c22986bcd9b4a4a0a..004559513d13dc0ac507ccd96e4133ea071393db 100644
--- a/src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
+++ b/src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
@@ -21,10 +21,11 @@ verifyProperty(C, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
 C.m().next().then(function(v) {
-  assert.sameValue(v, 42);
+  assert.sameValue(v.value, 42);
+  assert.sameValue(v.done, true);
 }, $DONE).then($DONE, $DONE);
diff --git a/src/class-fields/default/cls-decl-after-same-line-static-async-method.template b/src/class-fields/default/cls-decl-after-same-line-static-async-method.template
index f83605e6131abc5a7847f2983ee711e9bf742994..9829f1f19eb94d8d04708e73ba0bbfc84303efc2 100644
--- a/src/class-fields/default/cls-decl-after-same-line-static-async-method.template
+++ b/src/class-fields/default/cls-decl-after-same-line-static-async-method.template
@@ -21,7 +21,7 @@ verifyProperty(C, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
diff --git a/src/class-fields/default/cls-decl-multiple-definitions.template b/src/class-fields/default/cls-decl-multiple-definitions.template
index 4aaa9f3069990ed5d400f3ea24794952fe54fee8..5519f47e0efe10a48d99117c3ada787b304e3734 100644
--- a/src/class-fields/default/cls-decl-multiple-definitions.template
+++ b/src/class-fields/default/cls-decl-multiple-definitions.template
@@ -43,7 +43,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "foo"), false);
 
 verifyProperty(c, "foo", {
   value: "foobar",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
@@ -54,7 +54,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "bar"), false);
 
 verifyProperty(c, "bar", {
   value: "barbaz",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
diff --git a/src/class-fields/default/cls-decl-multiple-stacked-definitions.template b/src/class-fields/default/cls-decl-multiple-stacked-definitions.template
index d078ed5c05225ce8e5b2f268126d1cf5ba027e53..52a7fc637a292e0c129c00cba4da5fdbf1c06d46 100644
--- a/src/class-fields/default/cls-decl-multiple-stacked-definitions.template
+++ b/src/class-fields/default/cls-decl-multiple-stacked-definitions.template
@@ -15,17 +15,13 @@ class C {
 
 var c = new C();
 
-assert.sameValue(c.m(), 42);
-assert.sameValue(Object.hasOwnProperty.call(c, "m"), false);
-assert.sameValue(c.m, C.prototype.m);
-
 assert.sameValue(c.foo, "foobar");
 assert.sameValue(Object.hasOwnProperty.call(C, "foo"), false);
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, "foo"), false);
 
 verifyProperty(c, "foo", {
   value: "foobar",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
@@ -36,7 +32,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "bar"), false);
 
 verifyProperty(c, "bar", {
   value: "barbaz",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
diff --git a/src/class-fields/default/cls-decl-new-sc-line-generator.template b/src/class-fields/default/cls-decl-new-sc-line-generator.template
index c124d126e09d4b98bc3481c7a9ab2517f3551c43..db8a636e1af1f492d3761ccac69b5bca5eec5bc3 100644
--- a/src/class-fields/default/cls-decl-new-sc-line-generator.template
+++ b/src/class-fields/default/cls-decl-new-sc-line-generator.template
@@ -14,7 +14,7 @@ class C {
 
 var c = new C();
 
-assert.sameValue(c.g().next().value, 42);
+assert.sameValue(c.m().next().value, 42);
 assert.sameValue(c.m, C.prototype.m);
 assert.sameValue(Object.hasOwnProperty.call(c, "m"), false);
 
diff --git a/src/class-fields/default/cls-expr-after-same-line-async-gen.template b/src/class-fields/default/cls-expr-after-same-line-async-gen.template
index 4d5b119677e7fd81f861105b7a2a30c61d65c75b..1d9aae85225998e11996006a63e3d9ed7a80e70b 100644
--- a/src/class-fields/default/cls-expr-after-same-line-async-gen.template
+++ b/src/class-fields/default/cls-expr-after-same-line-async-gen.template
@@ -21,10 +21,11 @@ verifyProperty(C.prototype, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
 c.m().next().then(function(v) {
-  assert.sameValue(v, 42);
+  assert.sameValue(v.value, 42);
+  assert.sameValue(v.done, true);
 }, $DONE).then($DONE, $DONE);
diff --git a/src/class-fields/default/cls-expr-after-same-line-async-method.template b/src/class-fields/default/cls-expr-after-same-line-async-method.template
index 52a8356a9b7e25dade9d5109e1b6e5d6b741491a..18ebd86c7933f65c8b347de6ae682311a48403d2 100644
--- a/src/class-fields/default/cls-expr-after-same-line-async-method.template
+++ b/src/class-fields/default/cls-expr-after-same-line-async-method.template
@@ -21,7 +21,7 @@ verifyProperty(C.prototype, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
diff --git a/src/class-fields/default/cls-expr-after-same-line-static-async-gen.template b/src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
index f1fdb4f45de65ae8bfe677f78916a95ddb364320..2ce7c13c80a9c45e71166ab0bf0daebc231f146c 100644
--- a/src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
+++ b/src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
@@ -21,10 +21,11 @@ verifyProperty(C, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
 C.m().next().then(function(v) {
-  assert.sameValue(v, 42);
+  assert.sameValue(v.value, 42);
+  assert.sameValue(v.done, true);
 }, $DONE).then($DONE, $DONE);
diff --git a/src/class-fields/default/cls-expr-after-same-line-static-async-method.template b/src/class-fields/default/cls-expr-after-same-line-static-async-method.template
index caa1f2f234e0aa3c1bbcc5ffdbc8eb3992ef87dc..007288a4fa508830258bca57e7d1436e384e700f 100644
--- a/src/class-fields/default/cls-expr-after-same-line-static-async-method.template
+++ b/src/class-fields/default/cls-expr-after-same-line-static-async-method.template
@@ -21,7 +21,7 @@ verifyProperty(C, "m", {
   enumerable: false,
   configurable: true,
   writable: true,
-});
+}, {restore: true});
 
 /*{ assertions }*/
 
diff --git a/src/class-fields/default/cls-expr-multiple-definitions.template b/src/class-fields/default/cls-expr-multiple-definitions.template
index a5440f6265e4ab71482c346968e6c8ee98acdb99..be05aed55aaf3187fa651db68105154e60080e4a 100644
--- a/src/class-fields/default/cls-expr-multiple-definitions.template
+++ b/src/class-fields/default/cls-expr-multiple-definitions.template
@@ -43,7 +43,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "foo"), false);
 
 verifyProperty(c, "foo", {
   value: "foobar",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
@@ -54,7 +54,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "bar"), false);
 
 verifyProperty(c, "bar", {
   value: "barbaz",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
diff --git a/src/class-fields/default/cls-expr-multiple-stacked-definitions.template b/src/class-fields/default/cls-expr-multiple-stacked-definitions.template
index bd0d63c784dc66d25941db2e373273382100df97..ee9553f6edb997e1259066bd4ae9a397d82dec2d 100644
--- a/src/class-fields/default/cls-expr-multiple-stacked-definitions.template
+++ b/src/class-fields/default/cls-expr-multiple-stacked-definitions.template
@@ -15,17 +15,13 @@ var C = class {
 
 var c = new C();
 
-assert.sameValue(c.m(), 42);
-assert.sameValue(Object.hasOwnProperty.call(c, "m"), false);
-assert.sameValue(c.m, C.prototype.m);
-
 assert.sameValue(c.foo, "foobar");
 assert.sameValue(Object.hasOwnProperty.call(C, "foo"), false);
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, "foo"), false);
 
 verifyProperty(c, "foo", {
   value: "foobar",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
@@ -36,7 +32,7 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "bar"), false);
 
 verifyProperty(c, "bar", {
   value: "barbaz",
-  enumerable: false,
+  enumerable: true,
   configurable: true,
   writable: true,
 });
diff --git a/src/class-fields/default/cls-expr-new-sc-line-generator.template b/src/class-fields/default/cls-expr-new-sc-line-generator.template
index 5ddf98c7cd39b808fcd66f974b1353e581ffcfb5..50dafb9f38666e2add1913bd907681778b04fdd6 100644
--- a/src/class-fields/default/cls-expr-new-sc-line-generator.template
+++ b/src/class-fields/default/cls-expr-new-sc-line-generator.template
@@ -14,7 +14,7 @@ var C = class {
 
 var c = new C();
 
-assert.sameValue(c.g().next().value, 42);
+assert.sameValue(c.m().next().value, 42);
 assert.sameValue(c.m, C.prototype.m);
 assert.sameValue(Object.hasOwnProperty.call(c, "m"), false);
 
diff --git a/src/class-fields/string-literal-names.case b/src/class-fields/string-literal-names.case
index 98e37d5d083392bf81925e40a56db148cb9a2d3f..87260a46f25877030cd767a30b3a0d424eeb8854 100644
--- a/src/class-fields/string-literal-names.case
+++ b/src/class-fields/string-literal-names.case
@@ -26,6 +26,36 @@ assert.sameValue(Object.hasOwnProperty.call(C.prototype, "a"), false);
 assert.sameValue(Object.hasOwnProperty.call(C, "a"), false);
 
 verifyProperty(c, "a", {
+  value: undefined,
+  enumerable: true,
+  writable: true,
+  configurable: true
+});
+
+assert.sameValue(Object.hasOwnProperty.call(C.prototype, "b"), false);
+assert.sameValue(Object.hasOwnProperty.call(C, "b"), false);
+
+verifyProperty(c, "b", {
+  value: undefined,
+  enumerable: true,
+  writable: true,
+  configurable: true
+});
+
+assert.sameValue(Object.hasOwnProperty.call(C.prototype, "c"), false);
+assert.sameValue(Object.hasOwnProperty.call(C, "c"), false);
+
+verifyProperty(c, "c", {
+  value: 39,
+  enumerable: true,
+  writable: true,
+  configurable: true
+});
+
+assert.sameValue(Object.hasOwnProperty.call(C.prototype, "d"), false);
+assert.sameValue(Object.hasOwnProperty.call(C, "d"), false);
+
+verifyProperty(c, "d", {
   value: 42,
   enumerable: true,
   writable: true,