diff --git a/test/core/fixtures/transformation/es6-classes/accessing-super-class/expected.js b/test/core/fixtures/transformation/es6-classes/accessing-super-class/expected.js
index 3c6d4bdb1b..ea5b6257f4 100644
--- a/test/core/fixtures/transformation/es6-classes/accessing-super-class/expected.js
+++ b/test/core/fixtures/transformation/es6-classes/accessing-super-class/expected.js
@@ -18,26 +18,24 @@ var Test = (function (_Foo) {
   }
 
   babelHelpers.inherits(Test, _Foo);
-  babelHelpers.createClass(Test, {
-    test: {
-      value: function test() {
-        var _babelHelpers$get;
+  babelHelpers.createClass(Test, [{
+    key: "test",
+    value: function test() {
+      var _babelHelpers$get;
 
-        babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
-        babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this).apply(this, arguments);
-        (_babelHelpers$get = babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_babelHelpers$get, [this, "test"].concat(babelHelpers.slice.call(arguments)));
-      }
+      babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
+      babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this).apply(this, arguments);
+      (_babelHelpers$get = babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_babelHelpers$get, [this, "test"].concat(babelHelpers.slice.call(arguments)));
     }
-  }, {
-    foo: {
-      value: function foo() {
-        var _babelHelpers$get;
+  }], [{
+    key: "foo",
+    value: function foo() {
+      var _babelHelpers$get;
 
-        babelHelpers.get(Object.getPrototypeOf(Test), "foo", this).call(this);
-        babelHelpers.get(Object.getPrototypeOf(Test), "foo", this).apply(this, arguments);
-        (_babelHelpers$get = babelHelpers.get(Object.getPrototypeOf(Test), "foo", this)).call.apply(_babelHelpers$get, [this, "test"].concat(babelHelpers.slice.call(arguments)));
-      }
+      babelHelpers.get(Object.getPrototypeOf(Test), "foo", this).call(this);
+      babelHelpers.get(Object.getPrototypeOf(Test), "foo", this).apply(this, arguments);
+      (_babelHelpers$get = babelHelpers.get(Object.getPrototypeOf(Test), "foo", this)).call.apply(_babelHelpers$get, [this, "test"].concat(babelHelpers.slice.call(arguments)));
     }
-  });
+  }]);
   return Test;
-})(Foo);
\ No newline at end of file
+})(Foo);
diff --git a/test/core/fixtures/transformation/es6-classes/calling-super-properties/expected.js b/test/core/fixtures/transformation/es6-classes/calling-super-properties/expected.js
index 87afcb209d..bd6aedcc2a 100644
--- a/test/core/fixtures/transformation/es6-classes/calling-super-properties/expected.js
+++ b/test/core/fixtures/transformation/es6-classes/calling-super-properties/expected.js
@@ -10,12 +10,11 @@ var Test = (function (_Foo) {
   }
 
   babelHelpers.inherits(Test, _Foo);
-  babelHelpers.createClass(Test, null, {
-    test: {
-      value: function test() {
-        return babelHelpers.get(Object.getPrototypeOf(Test), "wow", this).call(this);
-      }
+  babelHelpers.createClass(Test, null, [{
+    key: "test",
+    value: function test() {
+      return babelHelpers.get(Object.getPrototypeOf(Test), "wow", this).call(this);
     }
-  });
+  }]);
   return Test;
-})(Foo);
\ No newline at end of file
+})(Foo);
diff --git a/test/core/fixtures/transformation/es6-classes/static/expected.js b/test/core/fixtures/transformation/es6-classes/static/expected.js
index 9e3c047187..b6363fea51 100644
--- a/test/core/fixtures/transformation/es6-classes/static/expected.js
+++ b/test/core/fixtures/transformation/es6-classes/static/expected.js
@@ -5,14 +5,13 @@ var A = (function () {
     babelHelpers.classCallCheck(this, A);
   }
 
-  babelHelpers.createClass(A, null, {
-    a: {
-      value: function a() {}
-    },
-    b: {
-      get: function () {},
-      set: function (b) {}
-    }
-  });
+  babelHelpers.createClass(A, null, [{
+    key: "a",
+    value: function a() {}
+  }, {
+    key: "b",
+    get: function () {},
+    set: function (b) {}
+  }]);
   return A;
-})();
\ No newline at end of file
+})();
diff --git a/test/core/fixtures/transformation/es6-constants/destructuring/expected.js b/test/core/fixtures/transformation/es6-constants/destructuring/expected.js
index aa1d464e48..877eccc290 100644
--- a/test/core/fixtures/transformation/es6-constants/destructuring/expected.js
+++ b/test/core/fixtures/transformation/es6-constants/destructuring/expected.js
@@ -4,9 +4,9 @@ var a = 1;
 var b = 2;
 var c = 3;
 var d = 4;
-var _ref = { e: 5, f: 6 };
-var e = _ref.e;
-var f = _ref.f;
-var _ref2 = { a: 7, b: 8 };
-var g = _ref2.a;
-var h = _ref2.b;
+var _e$f = { e: 5, f: 6 };
+var e = _e$f.e;
+var f = _e$f.f;
+var _a$b = { a: 7, b: 8 };
+var g = _a$b.a;
+var h = _a$b.b;
diff --git a/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/actual.js b/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/actual.js
index b4877d6e45..7c3ed3f0b6 100644
--- a/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/actual.js
+++ b/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/actual.js
@@ -1,3 +1,4 @@
+var z = {};
 var { ...x } = z;
 var { x, ...y } = z;
 (function({ x, ...y }) { })
diff --git a/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js b/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js
index cefe9cbafb..50c04d383a 100644
--- a/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js
+++ b/test/core/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js
@@ -1,5 +1,6 @@
 "use strict";
 
+var z = {};
 var x = babelHelpers.objectWithoutProperties(z, []);
 var x = z.x;
 var y = babelHelpers.objectWithoutProperties(z, ["x"]);
diff --git a/test/core/fixtures/transformation/es6-for-of-loose/identifier/expected.js b/test/core/fixtures/transformation/es6-for-of-loose/identifier/expected.js
index 0d8a45e609..cb83442b64 100644
--- a/test/core/fixtures/transformation/es6-for-of-loose/identifier/expected.js
+++ b/test/core/fixtures/transformation/es6-for-of-loose/identifier/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-for (var _iterator = arr, _isArray = _iterator && _iterator.constructor === Array, _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   if (_isArray) {
     if (_i >= _iterator.length) break;
     i = _iterator[_i++];
diff --git a/test/core/fixtures/transformation/es6-for-of-loose/ignore-cases/expected.js b/test/core/fixtures/transformation/es6-for-of-loose/ignore-cases/expected.js
index 58cd9b98e6..d7576bf4f7 100644
--- a/test/core/fixtures/transformation/es6-for-of-loose/ignore-cases/expected.js
+++ b/test/core/fixtures/transformation/es6-for-of-loose/ignore-cases/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-for (var _iterator = foo, _isArray = _iterator && _iterator.constructor === Array, _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+for (var _iterator = foo, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
 
   if (_isArray) {
diff --git a/test/core/fixtures/transformation/es6-for-of-loose/let/expected.js b/test/core/fixtures/transformation/es6-for-of-loose/let/expected.js
index 246b378924..24b278f864 100644
--- a/test/core/fixtures/transformation/es6-for-of-loose/let/expected.js
+++ b/test/core/fixtures/transformation/es6-for-of-loose/let/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-for (var _iterator = arr, _isArray = _iterator && _iterator.constructor === Array, _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
 
   if (_isArray) {
diff --git a/test/core/fixtures/transformation/es6-for-of-loose/member-expression/expected.js b/test/core/fixtures/transformation/es6-for-of-loose/member-expression/expected.js
index cc864f5fe8..10c85b30a2 100644
--- a/test/core/fixtures/transformation/es6-for-of-loose/member-expression/expected.js
+++ b/test/core/fixtures/transformation/es6-for-of-loose/member-expression/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-for (var _iterator = arr, _isArray = _iterator && _iterator.constructor === Array, _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   if (_isArray) {
     if (_i >= _iterator.length) break;
     obj.prop = _iterator[_i++];
diff --git a/test/core/fixtures/transformation/es6-for-of-loose/multiple/expected.js b/test/core/fixtures/transformation/es6-for-of-loose/multiple/expected.js
index fb5e478b26..f3a251f396 100644
--- a/test/core/fixtures/transformation/es6-for-of-loose/multiple/expected.js
+++ b/test/core/fixtures/transformation/es6-for-of-loose/multiple/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-for (var _iterator = arr, _isArray = _iterator && _iterator.constructor === Array, _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
 
   if (_isArray) {
@@ -15,7 +15,7 @@ for (var _iterator = arr, _isArray = _iterator && _iterator.constructor === Arra
   var i = _ref;
 }
 
-for (var _iterator2 = numbers, _isArray2 = _iterator2 && _iterator2.constructor === Array, _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+for (var _iterator2 = numbers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
   var _ref2;
 
   if (_isArray2) {
diff --git a/test/core/fixtures/transformation/es6-for-of-loose/var/expected.js b/test/core/fixtures/transformation/es6-for-of-loose/var/expected.js
index 246b378924..24b278f864 100644
--- a/test/core/fixtures/transformation/es6-for-of-loose/var/expected.js
+++ b/test/core/fixtures/transformation/es6-for-of-loose/var/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-for (var _iterator = arr, _isArray = _iterator && _iterator.constructor === Array, _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
 
   if (_isArray) {
diff --git a/test/core/fixtures/transformation/es6-modules-amd/exports-default/expected.js b/test/core/fixtures/transformation/es6-modules-amd/exports-default/expected.js
index 36bb526143..c5662089c9 100644
--- a/test/core/fixtures/transformation/es6-modules-amd/exports-default/expected.js
+++ b/test/core/fixtures/transformation/es6-modules-amd/exports-default/expected.js
@@ -28,4 +28,4 @@ define(["exports", "module"], function (exports, module) {
   };
 
   module.exports = Foo;
-});
\ No newline at end of file
+});
diff --git a/test/core/fixtures/transformation/es6-modules-common/exports-default/expected.js b/test/core/fixtures/transformation/es6-modules-common/exports-default/expected.js
index edb55396c5..e76142bd92 100644
--- a/test/core/fixtures/transformation/es6-modules-common/exports-default/expected.js
+++ b/test/core/fixtures/transformation/es6-modules-common/exports-default/expected.js
@@ -26,4 +26,4 @@ var Foo = function Foo() {
   _classCallCheck(this, Foo);
 };
 
-module.exports = Foo;
\ No newline at end of file
+module.exports = Foo;
diff --git a/test/core/fixtures/transformation/es6-modules-system/exports-default/expected.js b/test/core/fixtures/transformation/es6-modules-system/exports-default/expected.js
index 076677950a..d9113b298e 100644
--- a/test/core/fixtures/transformation/es6-modules-system/exports-default/expected.js
+++ b/test/core/fixtures/transformation/es6-modules-system/exports-default/expected.js
@@ -39,4 +39,4 @@ System.register([], function (_export) {
       _export("default", Foo);
     }
   };
-});
\ No newline at end of file
+});
diff --git a/test/core/fixtures/transformation/es6-modules-umd/exports-default/expected.js b/test/core/fixtures/transformation/es6-modules-umd/exports-default/expected.js
index 72cf92c9b3..6dcb9dc68f 100644
--- a/test/core/fixtures/transformation/es6-modules-umd/exports-default/expected.js
+++ b/test/core/fixtures/transformation/es6-modules-umd/exports-default/expected.js
@@ -34,4 +34,4 @@
   };
 
   module.exports = Foo;
-});
\ No newline at end of file
+});
diff --git a/test/core/fixtures/transformation/es7-comprehensions/array-multiple/expected.js b/test/core/fixtures/transformation/es7-comprehensions/array-multiple/expected.js
index 1989675a23..cf9691a164 100644
--- a/test/core/fixtures/transformation/es7-comprehensions/array-multiple/expected.js
+++ b/test/core/fixtures/transformation/es7-comprehensions/array-multiple/expected.js
@@ -9,7 +9,6 @@ var arr = (function () {
   try {
     for (var _iterator = "abcdefgh".split("")[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var x = _step.value;
-
       var _iteratorNormalCompletion2 = true;
       var _didIteratorError2 = false;
       var _iteratorError2 = undefined;
diff --git a/test/core/fixtures/transformation/runtime/modules-amd/expected.js b/test/core/fixtures/transformation/runtime/modules-amd/expected.js
index 9bec3573e2..046a8f71d4 100644
--- a/test/core/fixtures/transformation/runtime/modules-amd/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-amd/expected.js
@@ -4,4 +4,4 @@ define(["exports", "foo", "babel-runtime/helpers/interop-require"], function (ex
   var _interopRequire = _babelRuntimeHelpersInteropRequire["default"];
 
   var foo = _interopRequire(_foo);
-});
\ No newline at end of file
+});
diff --git a/test/core/fixtures/transformation/runtime/modules-umd/expected.js b/test/core/fixtures/transformation/runtime/modules-umd/expected.js
index 6365e2a2c0..8632367583 100644
--- a/test/core/fixtures/transformation/runtime/modules-umd/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-umd/expected.js
@@ -10,4 +10,4 @@
   var _interopRequire = _babelRuntimeHelpersInteropRequire["default"];
 
   var foo = _interopRequire(_foo);
-});
\ No newline at end of file
+});
diff --git a/test/core/fixtures/transformation/source-maps/class/source-mappings.json b/test/core/fixtures/transformation/source-maps/class/source-mappings.json
index 0bb3b62b7f..5d8c4d8816 100644
--- a/test/core/fixtures/transformation/source-maps/class/source-mappings.json
+++ b/test/core/fixtures/transformation/source-maps/class/source-mappings.json
@@ -4,7 +4,7 @@
     "column": 10
   },
   "generated": {
-    "line": 15,
+    "line": 11,
     "column": 15
   }
 }]