diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/basic/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/basic/actual.js
new file mode 100644
index 000000000..f4ee0758b
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/basic/actual.js
@@ -0,0 +1,4 @@
+function foo() {
+  console.log("foo");
+  blah();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/basic/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/basic/expected.js
new file mode 100644
index 000000000..0ea295184
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/basic/expected.js
@@ -0,0 +1,3 @@
+function foo() {
+  blah();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/actual.js
new file mode 100644
index 000000000..9e92dc098
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/actual.js
@@ -0,0 +1,7 @@
+function foo() {
+  const a = console.log;
+  a();
+  const b = console.error.bind(console);
+  b("asdf");
+  blah();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/expected.js
new file mode 100644
index 000000000..12267be31
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/expected.js
@@ -0,0 +1,7 @@
+function foo() {
+  const a = function () {};
+  a();
+  const b = console.error.bind(console);
+  b("asdf");
+  blah();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/options.json b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/options.json
new file mode 100644
index 000000000..20f6d726b
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/bound-excludes/options.json
@@ -0,0 +1 @@
+{"exclude":["error","info"]}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/actual.js
new file mode 100644
index 000000000..4bc9d417b
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/actual.js
@@ -0,0 +1,6 @@
+function foo() {
+  console.log("foo");
+  console.error("bar");
+  blah();
+  console.info("blah");
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/expected.js
new file mode 100644
index 000000000..60543fe9c
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/expected.js
@@ -0,0 +1,5 @@
+function foo() {
+  console.error("bar");
+  blah();
+  console.info("blah");
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/options.json b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/options.json
new file mode 100644
index 000000000..20f6d726b
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/excludes/options.json
@@ -0,0 +1 @@
+{"exclude":["error","info"]}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/guards/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/guards/actual.js
new file mode 100644
index 000000000..3a730757d
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/guards/actual.js
@@ -0,0 +1,4 @@
+function foo() {
+  true && console.log("foo");
+  blah();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/guards/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/guards/expected.js
new file mode 100644
index 000000000..9c57b2a05
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/guards/expected.js
@@ -0,0 +1,4 @@
+function foo() {
+  true && void 0;
+  blah();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/local-binding/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/local-binding/actual.js
new file mode 100644
index 000000000..26c59ac95
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/local-binding/actual.js
@@ -0,0 +1,11 @@
+function foo(console) {
+  console.foo("hi");
+  const bar = console.foo.bind(console);
+}
+function bar(a) {
+  const { console } = a;
+  a.b = console => console.bar("bar");
+  if (console.foo.call(console, "bar")) {
+    return;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/local-binding/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/local-binding/expected.js
new file mode 100644
index 000000000..26c59ac95
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/local-binding/expected.js
@@ -0,0 +1,11 @@
+function foo(console) {
+  console.foo("hi");
+  const bar = console.foo.bind(console);
+}
+function bar(a) {
+  const { console } = a;
+  a.b = console => console.bar("bar");
+  if (console.foo.call(console, "bar")) {
+    return;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-assignment-no-op/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-assignment-no-op/actual.js
new file mode 100644
index 000000000..1773ba8bb
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-assignment-no-op/actual.js
@@ -0,0 +1,8 @@
+function foo() {
+  console.foo = function foo() {
+    console.log("foo");
+  };
+  console.error = myConsoleError;
+  console.foo();
+  console.error("asdf");
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-assignment-no-op/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-assignment-no-op/expected.js
new file mode 100644
index 000000000..8cc5f973f
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-assignment-no-op/expected.js
@@ -0,0 +1,4 @@
+function foo() {
+  console.foo = function () {};
+  console.error = function () {};
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-no-op/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-no-op/actual.js
new file mode 100644
index 000000000..c4e363598
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-no-op/actual.js
@@ -0,0 +1,12 @@
+const a = console.log;
+a();
+const b = console.log.bind(console);
+b("asdf");
+var x = console.log ? console.log('log') : foo();
+function foo() {
+  if (console.error) {
+    console.error("Errored");
+  }
+}
+console.log.call(console, "foo");
+console.log.apply(null, {});
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-no-op/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-no-op/expected.js
new file mode 100644
index 000000000..cb22ebcca
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/member-expr-no-op/expected.js
@@ -0,0 +1,8 @@
+const a = function () {};
+a();
+const b = function () {};
+b("asdf");
+var x = function () {} ? void 0 : foo();
+function foo() {
+  if (function () {}) {}
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/replace-with-empty-block/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/replace-with-empty-block/actual.js
new file mode 100644
index 000000000..0d811d734
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/replace-with-empty-block/actual.js
@@ -0,0 +1,6 @@
+if (blah) console.log(blah);
+for (;;) console.log(blah);
+for (var blah in []) console.log(blah);
+for (var blah of []) console.log(blah);
+while (blah) console.log(blah);
+do console.log(blah); while (blah);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/replace-with-empty-block/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/replace-with-empty-block/expected.js
new file mode 100644
index 000000000..0547a38c7
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/replace-with-empty-block/expected.js
@@ -0,0 +1,6 @@
+if (blah) {}
+for (;;) {}
+for (var blah in []) {}
+for (var blah of []) {}
+while (blah) {}
+do {} while (blah);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level-stmts/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level-stmts/actual.js
new file mode 100644
index 000000000..7975b588f
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level-stmts/actual.js
@@ -0,0 +1,2 @@
+console.log("foo");
+blah();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level-stmts/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level-stmts/expected.js
new file mode 100644
index 000000000..2f13a633d
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level-stmts/expected.js
@@ -0,0 +1,2 @@
+
+blah();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level/actual.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level/actual.js
new file mode 100644
index 000000000..f2934f310
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level/actual.js
@@ -0,0 +1,2 @@
+true && console.log("foo");
+blah();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level/expected.js b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level/expected.js
new file mode 100644
index 000000000..ab345e62c
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/fixtures/top-level/expected.js
@@ -0,0 +1,2 @@
+true && void 0;
+blah();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/index.js b/packages/babel-plugin-transform-remove-console/__tests__/index.js
new file mode 100644
index 000000000..d7c81a111
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-console/__tests__/index.js
@@ -0,0 +1,2 @@
+const runner = require("test-runner");
+runner(__dirname);
diff --git a/packages/babel-plugin-transform-remove-console/__tests__/remove-console-test.js b/packages/babel-plugin-transform-remove-console/__tests__/remove-console-test.js
deleted file mode 100644
index b7d999ca0..000000000
--- a/packages/babel-plugin-transform-remove-console/__tests__/remove-console-test.js
+++ /dev/null
@@ -1,193 +0,0 @@
-jest.autoMockOff();
-
-const plugin = require("../src/index");
-const thePlugin = require("test-transform")(plugin);
-
-describe("remove-console-plugin", () => {
-  thePlugin(
-    "should remove `console.*` calls in nested statements",
-    `
-    function foo() {
-      console.log("foo");
-      blah();
-    }
-  `,
-    `
-    function foo() {
-      blah();
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove `console.*` calls in nested expressions",
-    `
-    function foo() {
-      true && console.log("foo");
-      blah();
-    }
-  `,
-    `
-    function foo() {
-      true && void 0;
-      blah();
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove `console.*` calls in top-level expressions",
-    `
-    true && console.log("foo");
-    blah();
-  `,
-    `
-    true && void 0;
-    blah();
-  `
-  );
-
-  thePlugin(
-    "should remove `console.*` calls in top-level statements",
-    `
-    console.log("foo");
-    blah();
-  `,
-    `
-    blah();
-  `
-  );
-
-  thePlugin(
-    "should remove `console.*` calls in statements not surrounded by a block",
-    `
-    if (blah) console.log(blah);
-    for (;;) console.log(blah);
-    for (var blah in []) console.log(blah);
-    for (var blah of []) console.log(blah);
-    while (blah) console.log(blah);
-    do console.log(blah); while (blah);
-  `,
-    `
-    if (blah) {}
-    for (;;) {}
-    for (var blah in []) {}
-    for (var blah of []) {}
-    while (blah) {}
-    do {} while (blah);
-  `
-  );
-
-  thePlugin(
-    "should remove `console.*` assignments to other variables and replace them with empty functions",
-    `
-    const a = console.log;
-    a();
-    const b = console.log.bind(console);
-    b("asdf");
-    var x = console.log ? console.log('log') : foo();
-    function foo() {
-      if (console.error) {
-        console.error("Errored");
-      }
-    }
-    console.log.call(console, "foo");
-    console.log.apply(null, {});
-  `,
-    `
-    const a = function () {};
-    a();
-    const b = function () {};
-    b("asdf");
-    var x = function () {} ? void 0 : foo();
-    function foo() {
-      if (function () {}) {}
-    }
-  `
-  );
-
-  thePlugin(
-    "should NOT remove local bindings of the name `console`",
-    `
-    function foo(console) {
-      console.foo("hi");
-      const bar = console.foo.bind(console);
-    }
-    function bar(a) {
-      const { console } = a;
-      a.b = console => console.bar("bar");
-      if (console.foo.call(console, "bar")) {
-        return;
-      }
-    }
-  `
-  );
-
-  thePlugin(
-    "should convert assigments from `console` functions to a no-op",
-    `
-    function foo() {
-      console.foo = function foo() {
-        console.log("foo");
-      };
-      console.error = myConsoleError;
-      console.foo();
-      console.error("asdf");
-    }
-  `,
-    `
-    function foo() {
-      console.foo = function () {};
-      console.error = function () {};
-    }
-  `
-  );
-});
-
-describe("remove-console-plugin with exclude argument", () => {
-  const options = {
-    plugins: [[plugin, { exclude: ["error", "info"] }]]
-  };
-
-  thePlugin(
-    "should not remove excluded options",
-    `
-    function foo() {
-      console.log("foo");
-      console.error("bar");
-      blah();
-      console.info("blah");
-    }
-  `,
-    `
-    function foo() {
-      console.error("bar");
-      blah();
-      console.info("blah");
-    }
-  `,
-    options
-  );
-  thePlugin(
-    "should not remove bound excluded options",
-    `
-    function foo() {
-      const a = console.log;
-      a();
-      const b = console.error.bind(console);
-      b("asdf");
-      blah();
-    }
-  `,
-    `
-    function foo() {
-      const a = function () {};
-      a();
-      const b = console.error.bind(console);
-      b("asdf");
-      blah();
-    }
-    `,
-    options
-  );
-});
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic-2/actual.js b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic-2/actual.js
new file mode 100644
index 000000000..79a2f13d1
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic-2/actual.js
@@ -0,0 +1 @@
+debugger; 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic-2/expected.js b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic-2/expected.js
new file mode 100644
index 000000000..691261564
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic-2/expected.js
@@ -0,0 +1 @@
+1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic/actual.js b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic/actual.js
new file mode 100644
index 000000000..9f5fb105a
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic/actual.js
@@ -0,0 +1 @@
+debugger;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic/expected.js b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/basic/expected.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/empty-block/actual.js b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/empty-block/actual.js
new file mode 100644
index 000000000..25b81b575
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/empty-block/actual.js
@@ -0,0 +1,6 @@
+if (blah) debugger;
+for (;;) debugger;
+for (var blah in []) debugger;
+for (var blah of []) debugger;
+while (blah) debugger;
+do debugger; while (blah);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/empty-block/expected.js b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/empty-block/expected.js
new file mode 100644
index 000000000..0547a38c7
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-debugger/__tests__/fixtures/empty-block/expected.js
@@ -0,0 +1,6 @@
+if (blah) {}
+for (;;) {}
+for (var blah in []) {}
+for (var blah of []) {}
+while (blah) {}
+do {} while (blah);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/index.js b/packages/babel-plugin-transform-remove-debugger/__tests__/index.js
new file mode 100644
index 000000000..d7c81a111
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-debugger/__tests__/index.js
@@ -0,0 +1,2 @@
+const runner = require("test-runner");
+runner(__dirname);
diff --git a/packages/babel-plugin-transform-remove-debugger/__tests__/remove-debugger-test.js b/packages/babel-plugin-transform-remove-debugger/__tests__/remove-debugger-test.js
deleted file mode 100644
index 444fc3d53..000000000
--- a/packages/babel-plugin-transform-remove-debugger/__tests__/remove-debugger-test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-jest.autoMockOff();
-
-const thePlugin = require("test-transform")(require("../src/index"));
-
-describe("remove-debugger-plugin", () => {
-  thePlugin(
-    "should remove `debugger` statements",
-    `
-    debugger;
-  `,
-    `
-  `
-  );
-
-  thePlugin(
-    "should not remove non-`debugger` statements on the same line as the `debugger` statement",
-    `
-    debugger; 1;
-  `,
-    `
-    1;
-  `
-  );
-
-  thePlugin(
-    "should add an empty block (`{}`) when the `debugger` statement was the only child of the block",
-    `
-    if (blah) debugger;
-    for (;;) debugger;
-    for (var blah in []) debugger;
-    for (var blah of []) debugger;
-    while (blah) debugger;
-    do debugger; while (blah);
-  `,
-    `
-    if (blah) {}
-    for (;;) {}
-    for (var blah in []) {}
-    for (var blah of []) {}
-    while (blah) {}
-    do {} while (blah);
-  `
-  );
-});
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/babel-plugin-transform-remove-undefined-test.js b/packages/babel-plugin-transform-remove-undefined/__tests__/babel-plugin-transform-remove-undefined-test.js
deleted file mode 100644
index e0de6a764..000000000
--- a/packages/babel-plugin-transform-remove-undefined/__tests__/babel-plugin-transform-remove-undefined-test.js
+++ /dev/null
@@ -1,241 +0,0 @@
-jest.autoMockOff();
-
-const thePlugin = require("test-transform")(require("../src/index"));
-
-describe("transform-remove-undefined-plugin", () => {
-  thePlugin(
-    "should remove multiple undefined assignments in 1 statement",
-    `
-    let a = undefined, b = 3, c = undefined, d;
-  `,
-    `
-    let a,
-        b = 3,
-        c,
-        d;
-  `
-  );
-
-  thePlugin(
-    "should remove let-assignments to undefined",
-    `
-    let a = undefined;
-  `,
-    `
-    let a;
-  `
-  );
-
-  thePlugin(
-    "should remove let-assignments to void 0",
-    `
-    let a = void 0;
-  `,
-    `
-    let a;
-  `
-  );
-
-  thePlugin(
-    "should not remove const-assignments to undefined",
-    `
-    const a = undefined;
-  `
-  );
-
-  thePlugin(
-    "should remove undefined return value",
-    `
-    function foo() {
-      return undefined;
-    }
-  `,
-    `
-    function foo() {
-      return;
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove var declarations in functions",
-    `
-    function foo() {
-      var a = undefined;
-    }
-  `,
-    `
-    function foo() {
-      var a;
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove let-assignments in inner blocks",
-    `
-    let a = 1;
-    {
-      let a = undefined;
-    }
-  `,
-    `
-    let a = 1;
-    {
-      let a;
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove var-assignments in loops if no modify",
-    `
-    for (var a = undefined;;) {
-      var b = undefined;
-    }
-  `,
-    `
-    for (var a;;) {
-      var b;
-    }
-  `
-  );
-
-  thePlugin(
-    "should not remove var-assignments in loops if modify",
-    `
-    for (var a;;) {
-      var b = undefined;
-      console.log(b);
-      b = 3;
-    }
-  `
-  );
-
-  thePlugin(
-    "should not remove var-assignments if referenced before",
-    `
-    function foo() {
-      a = 3;
-      var a = undefined;
-    }
-  `
-  );
-
-  thePlugin(
-    "should not remove nested var-assignments if referenced before",
-    `
-    function foo() {
-      aa = 3;
-      var { a: aa, b: bb } = undefined;
-    }
-  `
-  );
-
-  thePlugin(
-    "should not remove if lval is reference before via a function",
-    `
-    function foo() {
-      bar();
-      var x = undefined;
-      console.log(x);
-      function bar() {
-        x = 3;
-      }
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove if not referenced in any way before",
-    `
-    function foo() {
-      var x = undefined;
-      bar();
-      console.log(x);
-      function bar() {
-        x = 3;
-      }
-    }
-  `,
-    `
-    function foo() {
-      var x;
-      bar();
-      console.log(x);
-      function bar() {
-        x = 3;
-      }
-    }
-  `
-  );
-
-  thePlugin(
-    "should not remove on mutually recursive function",
-    `
-    function foo() {
-      a();
-      var c = undefined;
-      function a() {
-        b();
-      }
-      function b() {
-        a();
-        c = 3;
-      }
-    }
-  `
-  );
-
-  thePlugin(
-    "should not remove if rval has side effects",
-    `
-    function foo() {
-      var a = void b();
-      return void bar();
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove from sequence expressions",
-    `
-    a = b, void 0, b = c, d.e.f(), void 0, hello.world();
-  `,
-    `
-    a = b, b = c, d.e.f(), hello.world();
-  `
-  );
-
-  thePlugin(
-    "should NOT remove last undefined from sequence expressions",
-    `
-    if (foo.bar(), void 0) {
-      foo.baz();
-    }
-    function bar() {
-      return a.b(), void 0;
-    }
-  `
-  );
-
-  thePlugin(
-    "should remove last undefined from sequence expressions if safe",
-    `
-    a = b, void 0, b = c, d.e.f(), void 0, hello.world(), void 0;
-  `,
-    `
-    a = b, b = c, d.e.f(), hello.world();
-  `
-  );
-
-  thePlugin(
-    "should not remove local undefined",
-    `
-    function foo(undefined) {
-      a = b, undefined;
-      return undefined;
-    }
-  `
-  );
-});
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/const-undefined/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/const-undefined/actual.js
new file mode 100644
index 000000000..e251a9766
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/const-undefined/actual.js
@@ -0,0 +1 @@
+const a = undefined;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/const-undefined/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/const-undefined/expected.js
new file mode 100644
index 000000000..e251a9766
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/const-undefined/expected.js
@@ -0,0 +1 @@
+const a = undefined;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/inner-blocks-let/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/inner-blocks-let/actual.js
new file mode 100644
index 000000000..3de0b6608
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/inner-blocks-let/actual.js
@@ -0,0 +1,4 @@
+let a = 1;
+{
+  let a = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/inner-blocks-let/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/inner-blocks-let/expected.js
new file mode 100644
index 000000000..4d853c304
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/inner-blocks-let/expected.js
@@ -0,0 +1,4 @@
+let a = 1;
+{
+  let a;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-undefined/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-undefined/actual.js
new file mode 100644
index 000000000..25ea41d93
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-undefined/actual.js
@@ -0,0 +1 @@
+let a = undefined;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-undefined/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-undefined/expected.js
new file mode 100644
index 000000000..6bb8c26fb
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-undefined/expected.js
@@ -0,0 +1 @@
+let a;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-void-0/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-void-0/actual.js
new file mode 100644
index 000000000..7854189ba
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-void-0/actual.js
@@ -0,0 +1 @@
+let a = void 0;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-void-0/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-void-0/expected.js
new file mode 100644
index 000000000..6bb8c26fb
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/let-void-0/expected.js
@@ -0,0 +1 @@
+let a;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/local-var-undef/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/local-var-undef/actual.js
new file mode 100644
index 000000000..4f450df31
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/local-var-undef/actual.js
@@ -0,0 +1,4 @@
+function foo(undefined) {
+  a = b, undefined;
+  return undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/local-var-undef/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/local-var-undef/expected.js
new file mode 100644
index 000000000..4f450df31
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/local-var-undef/expected.js
@@ -0,0 +1,4 @@
+function foo(undefined) {
+  a = b, undefined;
+  return undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/lval-ref-fn-decl/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/lval-ref-fn-decl/actual.js
new file mode 100644
index 000000000..5206ba088
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/lval-ref-fn-decl/actual.js
@@ -0,0 +1,8 @@
+function foo() {
+  bar();
+  var x = undefined;
+  console.log(x);
+  function bar() {
+    x = 3;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/lval-ref-fn-decl/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/lval-ref-fn-decl/expected.js
new file mode 100644
index 000000000..5206ba088
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/lval-ref-fn-decl/expected.js
@@ -0,0 +1,8 @@
+function foo() {
+  bar();
+  var x = undefined;
+  console.log(x);
+  function bar() {
+    x = 3;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/mutually-recursive/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/mutually-recursive/actual.js
new file mode 100644
index 000000000..9b3ee39d4
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/mutually-recursive/actual.js
@@ -0,0 +1,11 @@
+function foo() {
+  a();
+  var c = undefined;
+  function a() {
+    b();
+  }
+  function b() {
+    a();
+    c = 3;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/mutually-recursive/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/mutually-recursive/expected.js
new file mode 100644
index 000000000..9b3ee39d4
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/mutually-recursive/expected.js
@@ -0,0 +1,11 @@
+function foo() {
+  a();
+  var c = undefined;
+  function a() {
+    b();
+  }
+  function b() {
+    a();
+    c = 3;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/not-referenced/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/not-referenced/actual.js
new file mode 100644
index 000000000..6ac340f5a
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/not-referenced/actual.js
@@ -0,0 +1,8 @@
+function foo() {
+  var x = undefined;
+  bar();
+  console.log(x);
+  function bar() {
+    x = 3;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/not-referenced/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/not-referenced/expected.js
new file mode 100644
index 000000000..552cc3710
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/not-referenced/expected.js
@@ -0,0 +1,8 @@
+function foo() {
+  var x;
+  bar();
+  console.log(x);
+  function bar() {
+    x = 3;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars-nested/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars-nested/actual.js
new file mode 100644
index 000000000..c6ab312a9
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars-nested/actual.js
@@ -0,0 +1,4 @@
+function foo() {
+  aa = 3;
+  var { a: aa, b: bb } = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars-nested/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars-nested/expected.js
new file mode 100644
index 000000000..c6ab312a9
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars-nested/expected.js
@@ -0,0 +1,4 @@
+function foo() {
+  aa = 3;
+  var { a: aa, b: bb } = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars/actual.js
new file mode 100644
index 000000000..9985d69e5
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars/actual.js
@@ -0,0 +1,4 @@
+function foo() {
+  a = 3;
+  var a = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars/expected.js
new file mode 100644
index 000000000..9985d69e5
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/referenced-vars/expected.js
@@ -0,0 +1,4 @@
+function foo() {
+  a = 3;
+  var a = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/remove-multiple-undefined/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/remove-multiple-undefined/actual.js
new file mode 100644
index 000000000..02bbbe8d7
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/remove-multiple-undefined/actual.js
@@ -0,0 +1 @@
+let a = undefined, b = 3, c = undefined, d;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/remove-multiple-undefined/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/remove-multiple-undefined/expected.js
new file mode 100644
index 000000000..146961549
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/remove-multiple-undefined/expected.js
@@ -0,0 +1,4 @@
+let a,
+    b = 3,
+    c,
+    d;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/rval-side-effects/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/rval-side-effects/actual.js
new file mode 100644
index 000000000..32a126deb
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/rval-side-effects/actual.js
@@ -0,0 +1,4 @@
+function foo() {
+  var a = void b();
+  return void bar();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/rval-side-effects/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/rval-side-effects/expected.js
new file mode 100644
index 000000000..32a126deb
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/rval-side-effects/expected.js
@@ -0,0 +1,4 @@
+function foo() {
+  var a = void b();
+  return void bar();
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef-safe/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef-safe/actual.js
new file mode 100644
index 000000000..ea113eda1
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef-safe/actual.js
@@ -0,0 +1 @@
+a = b, void 0, b = c, d.e.f(), void 0, hello.world(), void 0;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef-safe/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef-safe/expected.js
new file mode 100644
index 000000000..5e644072f
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef-safe/expected.js
@@ -0,0 +1 @@
+a = b, b = c, d.e.f(), hello.world();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef/actual.js
new file mode 100644
index 000000000..aa2c8d11d
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef/actual.js
@@ -0,0 +1,6 @@
+if (foo.bar(), void 0) {
+  foo.baz();
+}
+function bar() {
+  return a.b(), void 0;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef/expected.js
new file mode 100644
index 000000000..aa2c8d11d
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr-last-undef/expected.js
@@ -0,0 +1,6 @@
+if (foo.bar(), void 0) {
+  foo.baz();
+}
+function bar() {
+  return a.b(), void 0;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr/actual.js
new file mode 100644
index 000000000..559ce3972
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr/actual.js
@@ -0,0 +1 @@
+a = b, void 0, b = c, d.e.f(), void 0, hello.world();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr/expected.js
new file mode 100644
index 000000000..5e644072f
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/sequence-expr/expected.js
@@ -0,0 +1 @@
+a = b, b = c, d.e.f(), hello.world();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/undefined-return/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/undefined-return/actual.js
new file mode 100644
index 000000000..6dbac5385
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/undefined-return/actual.js
@@ -0,0 +1,3 @@
+function foo() {
+  return undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/undefined-return/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/undefined-return/expected.js
new file mode 100644
index 000000000..39342e80a
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/undefined-return/expected.js
@@ -0,0 +1,3 @@
+function foo() {
+  return;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-declarations/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-declarations/actual.js
new file mode 100644
index 000000000..52c688497
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-declarations/actual.js
@@ -0,0 +1,3 @@
+function foo() {
+  var a = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-declarations/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-declarations/expected.js
new file mode 100644
index 000000000..2aa118d96
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-declarations/expected.js
@@ -0,0 +1,3 @@
+function foo() {
+  var a;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-in-loops/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-in-loops/actual.js
new file mode 100644
index 000000000..0026b8044
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-in-loops/actual.js
@@ -0,0 +1,3 @@
+for (var a = undefined;;) {
+  var b = undefined;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-in-loops/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-in-loops/expected.js
new file mode 100644
index 000000000..7e45f8946
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-in-loops/expected.js
@@ -0,0 +1,3 @@
+for (var a;;) {
+  var b;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-loops-kviolate/actual.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-loops-kviolate/actual.js
new file mode 100644
index 000000000..bfff71428
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-loops-kviolate/actual.js
@@ -0,0 +1,5 @@
+for (var a;;) {
+  var b = undefined;
+  console.log(b);
+  b = 3;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-loops-kviolate/expected.js b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-loops-kviolate/expected.js
new file mode 100644
index 000000000..bfff71428
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/fixtures/var-loops-kviolate/expected.js
@@ -0,0 +1,5 @@
+for (var a;;) {
+  var b = undefined;
+  console.log(b);
+  b = 3;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-remove-undefined/__tests__/index.js b/packages/babel-plugin-transform-remove-undefined/__tests__/index.js
new file mode 100644
index 000000000..d7c81a111
--- /dev/null
+++ b/packages/babel-plugin-transform-remove-undefined/__tests__/index.js
@@ -0,0 +1,2 @@
+const runner = require("test-runner");
+runner(__dirname);
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/already-simplified/actual.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/already-simplified/actual.js
new file mode 100644
index 000000000..8ca09ae6c
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/already-simplified/actual.js
@@ -0,0 +1 @@
+typeof 1 == "number";
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/already-simplified/expected.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/already-simplified/expected.js
new file mode 100644
index 000000000..8ca09ae6c
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/already-simplified/expected.js
@@ -0,0 +1 @@
+typeof 1 == "number";
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/equality-check/actual.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/equality-check/actual.js
new file mode 100644
index 000000000..a2f8b1b3b
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/equality-check/actual.js
@@ -0,0 +1 @@
+a > b;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/equality-check/expected.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/equality-check/expected.js
new file mode 100644
index 000000000..a2f8b1b3b
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/equality-check/expected.js
@@ -0,0 +1 @@
+a > b;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/null-check/actual.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/null-check/actual.js
new file mode 100644
index 000000000..a1d350962
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/null-check/actual.js
@@ -0,0 +1,3 @@
+null === null;
+var x = null;
+x === null;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/null-check/expected.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/null-check/expected.js
new file mode 100644
index 000000000..94c5193ea
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/null-check/expected.js
@@ -0,0 +1,3 @@
+null == null;
+var x = null;
+x == null;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/strict-null/actual.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/strict-null/actual.js
new file mode 100644
index 000000000..bcc52d8a7
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/strict-null/actual.js
@@ -0,0 +1,4 @@
+var x;
+x === null;
+if (wow) x = foo();
+x === null;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/strict-null/expected.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/strict-null/expected.js
new file mode 100644
index 000000000..bcc52d8a7
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/strict-null/expected.js
@@ -0,0 +1,4 @@
+var x;
+x === null;
+if (wow) x = foo();
+x === null;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/typeof-comparisons/actual.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/typeof-comparisons/actual.js
new file mode 100644
index 000000000..6e27082be
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/typeof-comparisons/actual.js
@@ -0,0 +1 @@
+'function' === typeof a;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/typeof-comparisons/expected.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/typeof-comparisons/expected.js
new file mode 100644
index 000000000..11cf8a53f
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/fixtures/typeof-comparisons/expected.js
@@ -0,0 +1 @@
+'function' == typeof a;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/index.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/index.js
new file mode 100644
index 000000000..d7c81a111
--- /dev/null
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/index.js
@@ -0,0 +1,2 @@
+const runner = require("test-runner");
+runner(__dirname);
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/strict-equals-test.js b/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/strict-equals-test.js
deleted file mode 100644
index 4235cb1ed..000000000
--- a/packages/babel-plugin-transform-simplify-comparison-operators/__tests__/strict-equals-test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-jest.autoMockOff();
-
-const thePlugin = require("test-transform")(require("../src/index"));
-
-describe("simplify-comparison-operators-plugin", () => {
-  thePlugin(
-    "should simplify `typeof` comparisons",
-    `
-    'function' === typeof a;
-  `,
-    `
-    'function' == typeof a;
-  `
-  );
-
-  thePlugin(
-    "should simplify `== null` comparison operations where possible",
-    `
-    null === null;
-    var x = null;
-    x === null;
-  `,
-    `
-    null == null;
-    var x = null;
-    x == null;
-  `
-  );
-
-  thePlugin(
-    "should not simplify comparisons where losing the third = would change the result",
-    `
-    var x;
-    x === null;
-    if (wow) x = foo();
-    x === null;
-  `
-  );
-
-  thePlugin(
-    "should not simplify comparison if it is already simplified",
-    `
-    typeof 1 == "number";
-  `
-  );
-
-  thePlugin(
-    "should not simplify comparison if it is not an equality check",
-    `
-    a > b;
-  `
-  );
-});
diff --git a/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/basic/actual.js b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/basic/actual.js
new file mode 100644
index 000000000..7726ae6bd
--- /dev/null
+++ b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/basic/actual.js
@@ -0,0 +1 @@
+var foo;foo === undefined;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/basic/expected.js b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/basic/expected.js
new file mode 100644
index 000000000..258854821
--- /dev/null
+++ b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/basic/expected.js
@@ -0,0 +1 @@
+var foo;foo === void 0;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/member-expression/actual.js b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/member-expression/actual.js
new file mode 100644
index 000000000..f43f10b21
--- /dev/null
+++ b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/member-expression/actual.js
@@ -0,0 +1 @@
+var foo;foo === undefined.foo;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/member-expression/expected.js b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/member-expression/expected.js
new file mode 100644
index 000000000..e8a829d60
--- /dev/null
+++ b/packages/babel-plugin-transform-undefined-to-void/__tests__/fixtures/member-expression/expected.js
@@ -0,0 +1 @@
+var foo;foo === (void 0).foo;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-undefined-to-void/__tests__/index.js b/packages/babel-plugin-transform-undefined-to-void/__tests__/index.js
new file mode 100644
index 000000000..d7c81a111
--- /dev/null
+++ b/packages/babel-plugin-transform-undefined-to-void/__tests__/index.js
@@ -0,0 +1,2 @@
+const runner = require("test-runner");
+runner(__dirname);
diff --git a/packages/babel-plugin-transform-undefined-to-void/__tests__/undefined-test.js b/packages/babel-plugin-transform-undefined-to-void/__tests__/undefined-test.js
deleted file mode 100644
index bf76a51fe..000000000
--- a/packages/babel-plugin-transform-undefined-to-void/__tests__/undefined-test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-jest.autoMockOff();
-
-const thePlugin = require("test-transform")(require("../src/index"));
-
-describe("undefined-plugin", () => {
-  thePlugin(
-    "should turn `undefined` into `void 0`",
-    `
-    var foo;foo === undefined;
-  `,
-    `
-    var foo;foo === void 0;
-  `
-  );
-
-  thePlugin(
-    "should turn `undefined` into `void 0` in a MemberExpression",
-    `
-    var foo;foo === undefined.foo;
-  `,
-    `
-    var foo;foo === (void 0).foo;
-  `
-  );
-});