diff --git a/test/fixtures/generation/harmony-edgecase/class-declaration/expected.js b/test/fixtures/generation/harmony-edgecase/class-declaration/expected.js
index ab009cf248..339d11a071 100644
--- a/test/fixtures/generation/harmony-edgecase/class-declaration/expected.js
+++ b/test/fixtures/generation/harmony-edgecase/class-declaration/expected.js
@@ -1,46 +1,27 @@
-class Test {
-}
-class Derived extends Super {
-}
-class Derived2 extends Super() {
-}
+class Test {}
+class Derived extends Super {}
+class Derived2 extends Super() {}
 class StaticMethods {
-  static n1() {
-  }
-  static get get1() {
-  }
-  static set set1(value) {
-  }
-  static *gen1() {
-  }
+  static n1() {}
+  static get get1() {}
+  static set set1(value) {}
+  static *gen1() {}
 }
 class Methods {
-  n2() {
-  }
-  get get2() {
-  }
-  set set2(value) {
-  }
-  *gen1() {
-  }
+  n2() {}
+  get get2() {}
+  set set2(value) {}
+  *gen1() {}
 }
 class ComputedStaticMethods {
-  static n1() {
-  }
-  static get get1() {
-  }
-  static set set1(value) {
-  }
-  static *gen1() {
-  }
+  static [n1]() {}
+  static get [get1]() {}
+  static set [set1](value) {}
+  static *[gen1]() {}
 }
 class ComputedMethods {
-  n2() {
-  }
-  get get2() {
-  }
-  set set2(value) {
-  }
-  *gen1() {
-  }
+  [n2]() {}
+  get [get2]() {}
+  set [set2](value) {}
+  *[gen1]() {}
 }
diff --git a/test/fixtures/generation/harmony-edgecase/class-expression/actual.js b/test/fixtures/generation/harmony-edgecase/class-expression/actual.js
index 2172cb410d..6c78cf466c 100644
--- a/test/fixtures/generation/harmony-edgecase/class-expression/actual.js
+++ b/test/fixtures/generation/harmony-edgecase/class-expression/actual.js
@@ -1,7 +1,7 @@
-(class Test { });
-(class Derived extends Super { });
-(class Derived2 extends Super() { });
-(class StaticMethods {
+class Test { }
+class Derived extends Super { }
+class Derived2 extends Super() { }
+class StaticMethods {
   static n1() {
   }
 
@@ -13,8 +13,8 @@
 
   static *gen1() {
   }
-});
-(class Methods {
+}
+class Methods {
   n2() {
   }
 
@@ -26,8 +26,8 @@
 
   *gen1() {
   }
-});
-(class ComputedStaticMethods {
+}
+class ComputedStaticMethods {
   static [n1]() {
   }
 
@@ -39,8 +39,8 @@
 
   static *[gen1]() {
   }
-});
-(class ComputedMethods {
+}
+class ComputedMethods {
   [n2]() {
   }
 
@@ -52,6 +52,6 @@
 
   *[gen1]() {
   }
-});
+}
 (class { });
 (class extends Super() { });
diff --git a/test/fixtures/generation/harmony-edgecase/class-expression/expected.js b/test/fixtures/generation/harmony-edgecase/class-expression/expected.js
index f8e8daf387..6ae2a76668 100644
--- a/test/fixtures/generation/harmony-edgecase/class-expression/expected.js
+++ b/test/fixtures/generation/harmony-edgecase/class-expression/expected.js
@@ -1,50 +1,29 @@
-(class Test {
-});
-(class Derived extends Super {
-});
-(class Derived2 extends Super() {
-});
+(class Test {});
+(class Derived extends Super {});
+(class Derived2 extends Super() {});
 (class StaticMethods {
-  static n1() {
-  }
-  static get get1() {
-  }
-  static set set1(value) {
-  }
-  static *gen1() {
-  }
+  static n1() {}
+  static get get1() {}
+  static set set1(value) {}
+  static *gen1() {}
 });
 (class Methods {
-  n2() {
-  }
-  get get2() {
-  }
-  set set2(value) {
-  }
-  *gen1() {
-  }
+  n2() {}
+  get get2() {}
+  set set2(value) {}
+  *gen1() {}
 });
 (class ComputedStaticMethods {
-  static n1() {
-  }
-  static get get1() {
-  }
-  static set set1(value) {
-  }
-  static *gen1() {
-  }
+  static [n1]() {}
+  static get [get1]() {}
+  static set [set1](value) {}
+  static *[gen1]() {}
 });
 (class ComputedMethods {
-  n2() {
-  }
-  get get2() {
-  }
-  set set2(value) {
-  }
-  *gen1() {
-  }
-});
-(class {
-});
-(class extends Super() {
+  [n2]() {}
+  get [get2]() {}
+  set [set2](value) {}
+  *[gen1]() {}
 });
+(class {});
+(class extends Super() {});
diff --git a/test/fixtures/transformation/classes/defining-constructor-as-a-mutator/options.json b/test/fixtures/transformation/classes/defining-constructor-as-a-mutator/options.json
index 2761b2ba72..2b8c4aba05 100644
--- a/test/fixtures/transformation/classes/defining-constructor-as-a-mutator/options.json
+++ b/test/fixtures/transformation/classes/defining-constructor-as-a-mutator/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "unknown kind for constructor method"
+  "throws": "illegal kind for constructor method"
 }
diff --git a/test/fixtures/transformation/classes/super-class-id-member-expression/expected.js b/test/fixtures/transformation/classes/super-class-id-member-expression/expected.js
index ea49e16e82..1223ffc284 100644
--- a/test/fixtures/transformation/classes/super-class-id-member-expression/expected.js
+++ b/test/fixtures/transformation/classes/super-class-id-member-expression/expected.js
@@ -19,6 +19,7 @@ var BaseController = (function (Chaplin) {
 
   return BaseController;
 })(Chaplin);
+
 var BaseController2 = (function (Chaplin) {
   var BaseController2 = function BaseController2() {
     Chaplin.Controller.Another.apply(this, arguments);
@@ -27,4 +28,4 @@ var BaseController2 = (function (Chaplin) {
   _extends(BaseController2, Chaplin.Controller.Another);
 
   return BaseController2;
-})(Chaplin);
\ No newline at end of file
+})(Chaplin);