diff --git a/test/__snapshots__/runner.ts.snap b/test/__snapshots__/runner.ts.snap
new file mode 100644
index 0000000..2b0b730
--- /dev/null
+++ b/test/__snapshots__/runner.ts.snap
@@ -0,0 +1,523 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`collapse intersection interfaces  collapse-intersection-interfaces-transform advanced 1`] = `
+"type Foo = {
+    foo: string;
+    stuff: boolean;
+    other: () => void;
+    bar: number;
+    [key: string]: number;
+};"
+`;
+
+exports[`collapse intersection interfaces  collapse-intersection-interfaces-transform empty-empty 1`] = `
+"type Foo = {
+};"
+`;
+
+exports[`collapse intersection interfaces  collapse-intersection-interfaces-transform simple 1`] = `
+"type Foo = {
+    foo: string;
+    bar: number;
+};"
+`;
+
+exports[`end to end end-to-end basic 1`] = `
+"import * as React from 'react';
+export default class MyComponent extends React.Component<{
+    }, {
+    }> {
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`end to end end-to-end initial-state-and-proprypes 1`] = `
+"import * as React from 'react';
+type MyComponentProps = {
+    baz: string;
+};
+type MyComponentState = {
+    foo: number;
+    bar: string;
+};
+export default class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
+    state = { foo: 1, bar: 'str' };
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`end to end end-to-end initial-state-and-proprypes-and-set-state 1`] = `
+"import * as React from 'react';
+type MyComponentProps = {
+    baz: string;
+};
+type MyComponentState = {
+    dynamicState: number;
+    foo: number;
+    bar: string;
+};
+export default class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
+    state = { foo: 1, bar: 'str' };
+    render() {
+        return <div />;
+    }
+    otherFn() {
+        this.setState({ dynamicState: 42 });
+    }
+}"
+`;
+
+exports[`end to end end-to-end non-react 1`] = `
+"class Foo {
+    render() {
+        return '100';
+    }
+}
+class Bar extends Foo {
+    baz() {
+    }
+}"
+`;
+
+exports[`end to end end-to-end stateless-arrow-function 1`] = `
+"type HelloProps = {
+    message?: string;
+};
+const Hello: React.SFC<HelloProps> = ({ message }) => {
+    return <div>hello {message}</div>;
+};"
+`;
+
+exports[`end to end end-to-end stateless-function 1`] = `
+"type HelloProps = {
+    message?: string;
+};
+export const Hello: React.SFC<HelloProps> = ({ message }) => {
+    return <div>hello {message}</div>;
+};"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform non-react 1`] = `
+"interface IFoo {
+}
+class Foo {
+}
+class Bar extends Foo {
+}
+class Foo2 implements IFoo {
+}
+class Bar2 extends Foo  implements IFoo {
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform propless-stateless 1`] = `
+"import * as React from 'react';
+export default class MyComponent extends React.Component<{
+    }, {
+    }> {
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform set-state-advanced 1`] = `
+"import * as React from 'react';
+type MyComponentState = { foo: number; bar: number; } & { baz: number; } & { something: { big: number; here: string; of: { a: number; }[]; }; };
+export default class MyComponent extends React.Component<{
+    }, MyComponentState> {
+    render() {
+        return <button onClick={this.onclick.bind(this)}/>;
+    }
+    onclick() {
+        if (Math.random() > 0.5) {
+            this.setState({ foo: 1, bar: 2 });
+        }
+        this.otherMethod();
+    }
+    otherMethod() {
+        for (const foo of [1, 2, 3]) {
+            if (foo > 2) {
+                this.setState({ baz: foo });
+            }
+        }
+    }
+    addLargeObjectToState() {
+        this.setState({
+            something: {
+                big: 123,
+                here: 'string',
+                of: [{ a: 1 }, { a: 2 }]
+            }
+        });
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform set-state-only 1`] = `
+"import * as React from 'react';
+type MyComponentState = { foo: number; bar: number; };
+export default class MyComponent extends React.Component<{
+    }, MyComponentState> {
+    render() {
+        return <button onClick={this.onclick.bind(this)}/>;
+    }
+    onclick() {
+        this.setState({ foo: 1, bar: 2 });
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform state-in-class-member 1`] = `
+"import * as React from 'react';
+type MyComponentState = { foo: number; };
+export default class MyComponent extends React.Component<{
+    }, MyComponentState> {
+    state = { foo: 1 };
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform state-in-constructor 1`] = `
+"import * as React from 'react';
+type MyComponentState = { foo: number; };
+export default class MyComponent extends React.Component<{
+    }, MyComponentState> {
+    constructor(props, context) {
+        super(props, context);
+        this.state = { foo: 1 };
+    }
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform static-proptypes-getter-simple 1`] = `
+"import * as React from 'react';
+type MyComponentProps = {
+    foo: string;
+};
+export default class MyComponent extends React.Component<MyComponentProps, {
+    }> {
+    static get propTypes() {
+        return {
+            foo: React.PropTypes.string.isRequired,
+        };
+    }
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform static-proptypes-many-props 1`] = `
+"import * as React from 'react';
+type MyComponentProps = {
+    any?: any;
+    array?: any[];
+    bool?: boolean;
+    func?: (...args: any[]) => any;
+    number?: number;
+    object?: object;
+    string?: string;
+    node?: React.ReactNode;
+    element?: JSX.Element;
+    oneOf?: 'a' | 'b' | 'c';
+    oneOfType?: string | number;
+    arrayOf?: string[];
+    objectOf?: {
+        [key: string]: string;
+    };
+    shape?: {
+        color?: string;
+        fontSize?: number;
+    };
+    anyRequired: any;
+    arrayRequired: any[];
+    boolRequired: boolean;
+    funcRequired: (...args: any[]) => any;
+    numberRequired: number;
+    objectRequired: object;
+    stringRequired: string;
+    nodeRequired: React.ReactNode;
+    elementRequired: JSX.Element;
+    oneOfRequired: 'a' | 'b' | 'c';
+    oneOfTypeRequired: string | number;
+    arrayOfRequired: string[];
+    objectOfRequired: {
+        [key: string]: string;
+    };
+    shapeRequired: {
+        color?: string;
+        fontSize: number;
+    };
+};
+export default class MyComponent extends React.Component<MyComponentProps, {
+    }> {
+    static propTypes = {
+        children: React.PropTypes.node,
+        any: React.PropTypes.any,
+        array: React.PropTypes.array,
+        bool: React.PropTypes.bool,
+        func: React.PropTypes.func,
+        number: React.PropTypes.number,
+        object: React.PropTypes.object,
+        string: React.PropTypes.string,
+        node: React.PropTypes.node,
+        element: React.PropTypes.element,
+        oneOf: React.PropTypes.oneOf(['a', 'b', 'c']),
+        oneOfType: React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.number,
+        ]),
+        arrayOf: React.PropTypes.arrayOf(React.PropTypes.string),
+        objectOf: React.PropTypes.objectOf(React.PropTypes.string),
+        shape: React.PropTypes.shape({
+            color: React.PropTypes.string,
+            fontSize: React.PropTypes.number,
+        }),
+        anyRequired: React.PropTypes.any.isRequired,
+        arrayRequired: React.PropTypes.array.isRequired,
+        boolRequired: React.PropTypes.bool.isRequired,
+        funcRequired: React.PropTypes.func.isRequired,
+        numberRequired: React.PropTypes.number.isRequired,
+        objectRequired: React.PropTypes.object.isRequired,
+        stringRequired: React.PropTypes.string.isRequired,
+        nodeRequired: React.PropTypes.node.isRequired,
+        elementRequired: React.PropTypes.element.isRequired,
+        oneOfRequired: React.PropTypes.oneOf(['a', 'b', 'c']).isRequired,
+        oneOfTypeRequired: React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.number,
+        ]).isRequired,
+        arrayOfRequired: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
+        objectOfRequired: React.PropTypes.objectOf(React.PropTypes.string).isRequired,
+        shapeRequired: React.PropTypes.shape({
+            color: React.PropTypes.string,
+            fontSize: React.PropTypes.number.isRequired,
+        }).isRequired,
+    };
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`react js make props and state  react-js-make-props-and-state-transform static-proptypes-simple 1`] = `
+"import * as React from 'react';
+type MyComponentProps = {
+    foo: string;
+};
+export default class MyComponent extends React.Component<MyComponentProps, {
+    }> {
+    static propTypes = {
+        foo: React.PropTypes.string.isRequired,
+    };
+    render() {
+        return <div />;
+    }
+}"
+`;
+
+exports[`react move prop types to class  react-move-prop-types-to-class-transform simple 1`] = `
+"class SomeComponent extends React.Component<{
+        foo: number;
+    }, {
+        bar: string;
+    }> {
+    static propTypes = { foo: React.PropTypes.string };
+    render() {
+        return null;
+    }
+}
+SomeComponent.propTypes = { foo: React.PropTypes.string };"
+`;
+
+exports[`react remove prop types assignment  react-remove-prop-types-assignment-transform functional-components 1`] = `
+"import * as React from 'react';
+function Foo() {
+}"
+`;
+
+exports[`react remove prop types assignment  react-remove-prop-types-assignment-transform multiple 1`] = `
+"class SomeComponent extends React.Component<{
+        foo: number;
+    }, {
+        bar: string;
+    }> {
+}"
+`;
+
+exports[`react remove prop types assignment  react-remove-prop-types-assignment-transform simple 1`] = `
+"class SomeComponent extends React.Component<{
+        foo: number;
+    }, {
+        bar: string;
+    }> {
+}"
+`;
+
+exports[`react remove static prop types member  react-remove-static-prop-types-member-transform getter 1`] = `
+"class SomeComponent extends React.Component<{
+        foo: number;
+    }, {
+        bar: string;
+    }> {
+}"
+`;
+
+exports[`react remove static prop types member  react-remove-static-prop-types-member-transform multiple 1`] = `
+"class SomeComponent extends React.Component<{
+        foo: number;
+    }, {
+        bar: string;
+    }> {
+}"
+`;
+
+exports[`react remove static prop types member  react-remove-static-prop-types-member-transform simple 1`] = `
+"class SomeComponent extends React.Component<{
+        foo: number;
+    }, {
+        bar: string;
+    }> {
+}"
+`;
+
+exports[`react stateless function make props  react-stateless-function-make-props-transform empty-prop 1`] = `
+"const Hello: React.SFC<{
+    }> = () => {
+    return <div />;
+};
+Hello.propTypes = {};"
+`;
+
+exports[`react stateless function make props  react-stateless-function-make-props-transform stateless-arrow-function 1`] = `
+"type HelloProps = {
+    message?: string;
+};
+const Hello: React.SFC<HelloProps> = ({ message }) => {
+    return <div>hello {message}</div>;
+};
+Hello.propTypes = {
+    message: React.PropTypes.string,
+};"
+`;
+
+exports[`react stateless function make props  react-stateless-function-make-props-transform stateless-function 1`] = `
+"type HelloProps = {
+    message?: string;
+};
+const Hello: React.SFC<HelloProps> = ({ message }) => {
+    return <div>hello {message}</div>;
+};
+Hello.propTypes = {
+    message: React.PropTypes.string,
+};"
+`;
+
+exports[`react stateless function make props  react-stateless-function-make-props-transform stateless-function-many-props 1`] = `
+"import * as React from 'react';
+type MyComponentProps = {
+    any?: any;
+    array?: any[];
+    bool?: boolean;
+    func?: (...args: any[]) => any;
+    number?: number;
+    object?: object;
+    string?: string;
+    node?: React.ReactNode;
+    element?: JSX.Element;
+    oneOf?: 'a' | 'b' | 'c';
+    oneOfType?: string | number;
+    arrayOf?: string[];
+    objectOf?: {
+        [key: string]: string;
+    };
+    shape?: {
+        color?: string;
+        fontSize?: number;
+    };
+    anyRequired: any;
+    arrayRequired: any[];
+    boolRequired: boolean;
+    funcRequired: (...args: any[]) => any;
+    numberRequired: number;
+    objectRequired: object;
+    stringRequired: string;
+    nodeRequired: React.ReactNode;
+    elementRequired: JSX.Element;
+    oneOfRequired: 'a' | 'b' | 'c';
+    oneOfTypeRequired: string | number;
+    arrayOfRequired: string[];
+    objectOfRequired: {
+        [key: string]: string;
+    };
+    shapeRequired: {
+        color?: string;
+        fontSize: number;
+    };
+};
+const MyComponent: React.SFC<MyComponentProps> = () => {
+    return <div />;
+};
+MyComponent.propTypes = {
+    children: React.PropTypes.node,
+    any: React.PropTypes.any,
+    array: React.PropTypes.array,
+    bool: React.PropTypes.bool,
+    func: React.PropTypes.func,
+    number: React.PropTypes.number,
+    object: React.PropTypes.object,
+    string: React.PropTypes.string,
+    node: React.PropTypes.node,
+    element: React.PropTypes.element,
+    oneOf: React.PropTypes.oneOf(['a', 'b', 'c']),
+    oneOfType: React.PropTypes.oneOfType([
+        React.PropTypes.string,
+        React.PropTypes.number,
+    ]),
+    arrayOf: React.PropTypes.arrayOf(React.PropTypes.string),
+    objectOf: React.PropTypes.objectOf(React.PropTypes.string),
+    shape: React.PropTypes.shape({
+        color: React.PropTypes.string,
+        fontSize: React.PropTypes.number,
+    }),
+    anyRequired: React.PropTypes.any.isRequired,
+    arrayRequired: React.PropTypes.array.isRequired,
+    boolRequired: React.PropTypes.bool.isRequired,
+    funcRequired: React.PropTypes.func.isRequired,
+    numberRequired: React.PropTypes.number.isRequired,
+    objectRequired: React.PropTypes.object.isRequired,
+    stringRequired: React.PropTypes.string.isRequired,
+    nodeRequired: React.PropTypes.node.isRequired,
+    elementRequired: React.PropTypes.element.isRequired,
+    oneOfRequired: React.PropTypes.oneOf(['a', 'b', 'c']).isRequired,
+    oneOfTypeRequired: React.PropTypes.oneOfType([
+        React.PropTypes.string,
+        React.PropTypes.number,
+    ]).isRequired,
+    arrayOfRequired: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
+    objectOfRequired: React.PropTypes.objectOf(React.PropTypes.string).isRequired,
+    shapeRequired: React.PropTypes.shape({
+        color: React.PropTypes.string,
+        fontSize: React.PropTypes.number.isRequired,
+    }).isRequired,
+};"
+`;
+
+exports[`react stateless function make props  react-stateless-function-make-props-transform stateless-propless 1`] = `
+"const Hello1 = ({ message }) => {
+    return <div>hello {message}</div>;
+};
+function Hello2({ message }) {
+    return <div>hello {message}</div>;
+}"
+`;
diff --git a/test/collapse-intersection-interfaces-transform/advanced/output.tsx b/test/collapse-intersection-interfaces-transform/advanced/output.tsx
deleted file mode 100644
index a272d5a..0000000
--- a/test/collapse-intersection-interfaces-transform/advanced/output.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-type Foo = {
-    foo: string;
-    stuff: boolean;
-    other: () => void;
-    bar: number;
-    [key: string]: number;
-};
diff --git a/test/collapse-intersection-interfaces-transform/empty-empty/output.tsx b/test/collapse-intersection-interfaces-transform/empty-empty/output.tsx
deleted file mode 100644
index ad4c7b6..0000000
--- a/test/collapse-intersection-interfaces-transform/empty-empty/output.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-type Foo = {
-};
diff --git a/test/collapse-intersection-interfaces-transform/simple/output.tsx b/test/collapse-intersection-interfaces-transform/simple/output.tsx
deleted file mode 100644
index 97d43d9..0000000
--- a/test/collapse-intersection-interfaces-transform/simple/output.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-type Foo = {
-    foo: string;
-    bar: number;
-};
diff --git a/test/end-to-end/basic/output.tsx b/test/end-to-end/basic/output.tsx
deleted file mode 100644
index b2d81de..0000000
--- a/test/end-to-end/basic/output.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as React from 'react';
-export default class MyComponent extends React.Component<{
-    }, {
-    }> {
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/end-to-end/initial-state-and-proprypes-and-set-state/output.tsx b/test/end-to-end/initial-state-and-proprypes-and-set-state/output.tsx
deleted file mode 100644
index b120653..0000000
--- a/test/end-to-end/initial-state-and-proprypes-and-set-state/output.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as React from 'react';
-type MyComponentProps = {
-    baz: string;
-};
-type MyComponentState = {
-    dynamicState: number;
-    foo: number;
-    bar: string;
-};
-export default class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
-    state = { foo: 1, bar: 'str' };
-    render() {
-        return <div />;
-    }
-    otherFn() {
-        this.setState({ dynamicState: 42 });
-    }
-}
diff --git a/test/end-to-end/initial-state-and-proprypes/output.tsx b/test/end-to-end/initial-state-and-proprypes/output.tsx
deleted file mode 100644
index 93ed422..0000000
--- a/test/end-to-end/initial-state-and-proprypes/output.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as React from 'react';
-type MyComponentProps = {
-    baz: string;
-};
-type MyComponentState = {
-    foo: number;
-    bar: string;
-};
-export default class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
-    state = { foo: 1, bar: 'str' };
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/end-to-end/non-react/output.tsx b/test/end-to-end/non-react/output.tsx
deleted file mode 100644
index 2c39a54..0000000
--- a/test/end-to-end/non-react/output.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-class Foo {
-    render() {
-        return '100';
-    }
-}
-class Bar extends Foo {
-    baz() {
-    }
-}
diff --git a/test/end-to-end/stateless-arrow-function/output.tsx b/test/end-to-end/stateless-arrow-function/output.tsx
deleted file mode 100644
index 818a84d..0000000
--- a/test/end-to-end/stateless-arrow-function/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-type HelloProps = {
-    message?: string;
-};
-const Hello: React.SFC<HelloProps> = ({ message }) => {
-    return <div>hello {message}</div>;
-};
diff --git a/test/end-to-end/stateless-function/output.tsx b/test/end-to-end/stateless-function/output.tsx
deleted file mode 100644
index fb38d33..0000000
--- a/test/end-to-end/stateless-function/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-type HelloProps = {
-    message?: string;
-};
-export const Hello: React.SFC<HelloProps> = ({ message }) => {
-    return <div>hello {message}</div>;
-};
diff --git a/test/react-js-make-props-and-state-transform/non-react/output.tsx b/test/react-js-make-props-and-state-transform/non-react/output.tsx
deleted file mode 100644
index ea73175..0000000
--- a/test/react-js-make-props-and-state-transform/non-react/output.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-interface IFoo {
-}
-class Foo {
-}
-class Bar extends Foo {
-}
-class Foo2 implements IFoo {
-}
-class Bar2 extends Foo  implements IFoo {
-}
diff --git a/test/react-js-make-props-and-state-transform/propless-stateless/output.tsx b/test/react-js-make-props-and-state-transform/propless-stateless/output.tsx
deleted file mode 100644
index b2d81de..0000000
--- a/test/react-js-make-props-and-state-transform/propless-stateless/output.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as React from 'react';
-export default class MyComponent extends React.Component<{
-    }, {
-    }> {
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/set-state-advanced/output.tsx b/test/react-js-make-props-and-state-transform/set-state-advanced/output.tsx
deleted file mode 100644
index 15ae2c3..0000000
--- a/test/react-js-make-props-and-state-transform/set-state-advanced/output.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as React from 'react';
-type MyComponentState = { foo: number; bar: number; } & { baz: number; } & { something: { big: number; here: string; of: { a: number; }[]; }; };
-export default class MyComponent extends React.Component<{
-    }, MyComponentState> {
-    render() {
-        return <button onClick={this.onclick.bind(this)}/>;
-    }
-    onclick() {
-        if (Math.random() > 0.5) {
-            this.setState({ foo: 1, bar: 2 });
-        }
-        this.otherMethod();
-    }
-    otherMethod() {
-        for (const foo of [1, 2, 3]) {
-            if (foo > 2) {
-                this.setState({ baz: foo });
-            }
-        }
-    }
-    addLargeObjectToState() {
-        this.setState({
-            something: {
-                big: 123,
-                here: 'string',
-                of: [{ a: 1 }, { a: 2 }]
-            }
-        });
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/set-state-only/output.tsx b/test/react-js-make-props-and-state-transform/set-state-only/output.tsx
deleted file mode 100644
index 91605f1..0000000
--- a/test/react-js-make-props-and-state-transform/set-state-only/output.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as React from 'react';
-type MyComponentState = { foo: number; bar: number; };
-export default class MyComponent extends React.Component<{
-    }, MyComponentState> {
-    render() {
-        return <button onClick={this.onclick.bind(this)}/>;
-    }
-    onclick() {
-        this.setState({ foo: 1, bar: 2 });
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/state-in-class-member/output.tsx b/test/react-js-make-props-and-state-transform/state-in-class-member/output.tsx
deleted file mode 100644
index 5f0d504..0000000
--- a/test/react-js-make-props-and-state-transform/state-in-class-member/output.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as React from 'react';
-type MyComponentState = { foo: number; };
-export default class MyComponent extends React.Component<{
-    }, MyComponentState> {
-    state = { foo: 1 };
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/state-in-constructor/output.tsx b/test/react-js-make-props-and-state-transform/state-in-constructor/output.tsx
deleted file mode 100644
index 0226e15..0000000
--- a/test/react-js-make-props-and-state-transform/state-in-constructor/output.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as React from 'react';
-type MyComponentState = { foo: number; };
-export default class MyComponent extends React.Component<{
-    }, MyComponentState> {
-    constructor(props, context) {
-        super(props, context);
-        this.state = { foo: 1 };
-    }
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/static-proptypes-getter-simple/output.tsx b/test/react-js-make-props-and-state-transform/static-proptypes-getter-simple/output.tsx
deleted file mode 100644
index 4a505d6..0000000
--- a/test/react-js-make-props-and-state-transform/static-proptypes-getter-simple/output.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react';
-type MyComponentProps = {
-    foo: string;
-};
-export default class MyComponent extends React.Component<MyComponentProps, {
-    }> {
-    static get propTypes() {
-        return {
-            foo: React.PropTypes.string.isRequired,
-        };
-    }
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/static-proptypes-many-props/output.tsx b/test/react-js-make-props-and-state-transform/static-proptypes-many-props/output.tsx
deleted file mode 100644
index abecef9..0000000
--- a/test/react-js-make-props-and-state-transform/static-proptypes-many-props/output.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import * as React from 'react';
-type MyComponentProps = {
-    any?: any;
-    array?: any[];
-    bool?: boolean;
-    func?: (...args: any[]) => any;
-    number?: number;
-    object?: object;
-    string?: string;
-    node?: React.ReactNode;
-    element?: JSX.Element;
-    oneOf?: 'a' | 'b' | 'c';
-    oneOfType?: string | number;
-    arrayOf?: string[];
-    objectOf?: {
-        [key: string]: string;
-    };
-    shape?: {
-        color?: string;
-        fontSize?: number;
-    };
-    anyRequired: any;
-    arrayRequired: any[];
-    boolRequired: boolean;
-    funcRequired: (...args: any[]) => any;
-    numberRequired: number;
-    objectRequired: object;
-    stringRequired: string;
-    nodeRequired: React.ReactNode;
-    elementRequired: JSX.Element;
-    oneOfRequired: 'a' | 'b' | 'c';
-    oneOfTypeRequired: string | number;
-    arrayOfRequired: string[];
-    objectOfRequired: {
-        [key: string]: string;
-    };
-    shapeRequired: {
-        color?: string;
-        fontSize: number;
-    };
-};
-export default class MyComponent extends React.Component<MyComponentProps, {
-    }> {
-    static propTypes = {
-        children: React.PropTypes.node,
-        any: React.PropTypes.any,
-        array: React.PropTypes.array,
-        bool: React.PropTypes.bool,
-        func: React.PropTypes.func,
-        number: React.PropTypes.number,
-        object: React.PropTypes.object,
-        string: React.PropTypes.string,
-        node: React.PropTypes.node,
-        element: React.PropTypes.element,
-        oneOf: React.PropTypes.oneOf(['a', 'b', 'c']),
-        oneOfType: React.PropTypes.oneOfType([
-            React.PropTypes.string,
-            React.PropTypes.number,
-        ]),
-        arrayOf: React.PropTypes.arrayOf(React.PropTypes.string),
-        objectOf: React.PropTypes.objectOf(React.PropTypes.string),
-        shape: React.PropTypes.shape({
-            color: React.PropTypes.string,
-            fontSize: React.PropTypes.number,
-        }),
-        anyRequired: React.PropTypes.any.isRequired,
-        arrayRequired: React.PropTypes.array.isRequired,
-        boolRequired: React.PropTypes.bool.isRequired,
-        funcRequired: React.PropTypes.func.isRequired,
-        numberRequired: React.PropTypes.number.isRequired,
-        objectRequired: React.PropTypes.object.isRequired,
-        stringRequired: React.PropTypes.string.isRequired,
-        nodeRequired: React.PropTypes.node.isRequired,
-        elementRequired: React.PropTypes.element.isRequired,
-        oneOfRequired: React.PropTypes.oneOf(['a', 'b', 'c']).isRequired,
-        oneOfTypeRequired: React.PropTypes.oneOfType([
-            React.PropTypes.string,
-            React.PropTypes.number,
-        ]).isRequired,
-        arrayOfRequired: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
-        objectOfRequired: React.PropTypes.objectOf(React.PropTypes.string).isRequired,
-        shapeRequired: React.PropTypes.shape({
-            color: React.PropTypes.string,
-            fontSize: React.PropTypes.number.isRequired,
-        }).isRequired,
-    };
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/react-js-make-props-and-state-transform/static-proptypes-simple/output.tsx b/test/react-js-make-props-and-state-transform/static-proptypes-simple/output.tsx
deleted file mode 100644
index 70b324d..0000000
--- a/test/react-js-make-props-and-state-transform/static-proptypes-simple/output.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from 'react';
-type MyComponentProps = {
-    foo: string;
-};
-export default class MyComponent extends React.Component<MyComponentProps, {
-    }> {
-    static propTypes = {
-        foo: React.PropTypes.string.isRequired,
-    };
-    render() {
-        return <div />;
-    }
-}
diff --git a/test/react-move-prop-types-to-class-transform/simple/output.tsx b/test/react-move-prop-types-to-class-transform/simple/output.tsx
deleted file mode 100644
index d87eb58..0000000
--- a/test/react-move-prop-types-to-class-transform/simple/output.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-class SomeComponent extends React.Component<{
-        foo: number;
-    }, {
-        bar: string;
-    }> {
-    static propTypes = { foo: React.PropTypes.string };
-    render() {
-        return null;
-    }
-}
-SomeComponent.propTypes = { foo: React.PropTypes.string };
diff --git a/test/react-remove-prop-types-assignment-transform/functional-components/output.tsx b/test/react-remove-prop-types-assignment-transform/functional-components/output.tsx
deleted file mode 100644
index 6e4269d..0000000
--- a/test/react-remove-prop-types-assignment-transform/functional-components/output.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-function Foo() {
-}
diff --git a/test/react-remove-prop-types-assignment-transform/multiple/output.tsx b/test/react-remove-prop-types-assignment-transform/multiple/output.tsx
deleted file mode 100644
index 605714f..0000000
--- a/test/react-remove-prop-types-assignment-transform/multiple/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-class SomeComponent extends React.Component<{
-        foo: number;
-    }, {
-        bar: string;
-    }> {
-}
diff --git a/test/react-remove-prop-types-assignment-transform/simple/output.tsx b/test/react-remove-prop-types-assignment-transform/simple/output.tsx
deleted file mode 100644
index 605714f..0000000
--- a/test/react-remove-prop-types-assignment-transform/simple/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-class SomeComponent extends React.Component<{
-        foo: number;
-    }, {
-        bar: string;
-    }> {
-}
diff --git a/test/react-remove-static-prop-types-member-transform/getter/output.tsx b/test/react-remove-static-prop-types-member-transform/getter/output.tsx
deleted file mode 100644
index 605714f..0000000
--- a/test/react-remove-static-prop-types-member-transform/getter/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-class SomeComponent extends React.Component<{
-        foo: number;
-    }, {
-        bar: string;
-    }> {
-}
diff --git a/test/react-remove-static-prop-types-member-transform/multiple/output.tsx b/test/react-remove-static-prop-types-member-transform/multiple/output.tsx
deleted file mode 100644
index 605714f..0000000
--- a/test/react-remove-static-prop-types-member-transform/multiple/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-class SomeComponent extends React.Component<{
-        foo: number;
-    }, {
-        bar: string;
-    }> {
-}
diff --git a/test/react-remove-static-prop-types-member-transform/simple/output.tsx b/test/react-remove-static-prop-types-member-transform/simple/output.tsx
deleted file mode 100644
index 605714f..0000000
--- a/test/react-remove-static-prop-types-member-transform/simple/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-class SomeComponent extends React.Component<{
-        foo: number;
-    }, {
-        bar: string;
-    }> {
-}
diff --git a/test/react-stateless-function-make-props-transform/empty-prop/output.tsx b/test/react-stateless-function-make-props-transform/empty-prop/output.tsx
deleted file mode 100644
index 8846655..0000000
--- a/test/react-stateless-function-make-props-transform/empty-prop/output.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const Hello: React.SFC<{
-    }> = () => {
-    return <div />;
-};
-Hello.propTypes = {};
diff --git a/test/react-stateless-function-make-props-transform/stateless-arrow-function/output.tsx b/test/react-stateless-function-make-props-transform/stateless-arrow-function/output.tsx
deleted file mode 100644
index ba53855..0000000
--- a/test/react-stateless-function-make-props-transform/stateless-arrow-function/output.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-type HelloProps = {
-    message?: string;
-};
-const Hello: React.SFC<HelloProps> = ({ message }) => {
-    return <div>hello {message}</div>;
-};
-Hello.propTypes = {
-    message: React.PropTypes.string,
-};
diff --git a/test/react-stateless-function-make-props-transform/stateless-function-many-props/output.tsx b/test/react-stateless-function-make-props-transform/stateless-function-many-props/output.tsx
deleted file mode 100644
index e21a182..0000000
--- a/test/react-stateless-function-make-props-transform/stateless-function-many-props/output.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import * as React from 'react';
-type MyComponentProps = {
-    any?: any;
-    array?: any[];
-    bool?: boolean;
-    func?: (...args: any[]) => any;
-    number?: number;
-    object?: object;
-    string?: string;
-    node?: React.ReactNode;
-    element?: JSX.Element;
-    oneOf?: 'a' | 'b' | 'c';
-    oneOfType?: string | number;
-    arrayOf?: string[];
-    objectOf?: {
-        [key: string]: string;
-    };
-    shape?: {
-        color?: string;
-        fontSize?: number;
-    };
-    anyRequired: any;
-    arrayRequired: any[];
-    boolRequired: boolean;
-    funcRequired: (...args: any[]) => any;
-    numberRequired: number;
-    objectRequired: object;
-    stringRequired: string;
-    nodeRequired: React.ReactNode;
-    elementRequired: JSX.Element;
-    oneOfRequired: 'a' | 'b' | 'c';
-    oneOfTypeRequired: string | number;
-    arrayOfRequired: string[];
-    objectOfRequired: {
-        [key: string]: string;
-    };
-    shapeRequired: {
-        color?: string;
-        fontSize: number;
-    };
-};
-const MyComponent: React.SFC<MyComponentProps> = () => {
-    return <div />;
-};
-MyComponent.propTypes = {
-    children: React.PropTypes.node,
-    any: React.PropTypes.any,
-    array: React.PropTypes.array,
-    bool: React.PropTypes.bool,
-    func: React.PropTypes.func,
-    number: React.PropTypes.number,
-    object: React.PropTypes.object,
-    string: React.PropTypes.string,
-    node: React.PropTypes.node,
-    element: React.PropTypes.element,
-    oneOf: React.PropTypes.oneOf(['a', 'b', 'c']),
-    oneOfType: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.number,
-    ]),
-    arrayOf: React.PropTypes.arrayOf(React.PropTypes.string),
-    objectOf: React.PropTypes.objectOf(React.PropTypes.string),
-    shape: React.PropTypes.shape({
-        color: React.PropTypes.string,
-        fontSize: React.PropTypes.number,
-    }),
-    anyRequired: React.PropTypes.any.isRequired,
-    arrayRequired: React.PropTypes.array.isRequired,
-    boolRequired: React.PropTypes.bool.isRequired,
-    funcRequired: React.PropTypes.func.isRequired,
-    numberRequired: React.PropTypes.number.isRequired,
-    objectRequired: React.PropTypes.object.isRequired,
-    stringRequired: React.PropTypes.string.isRequired,
-    nodeRequired: React.PropTypes.node.isRequired,
-    elementRequired: React.PropTypes.element.isRequired,
-    oneOfRequired: React.PropTypes.oneOf(['a', 'b', 'c']).isRequired,
-    oneOfTypeRequired: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.number,
-    ]).isRequired,
-    arrayOfRequired: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
-    objectOfRequired: React.PropTypes.objectOf(React.PropTypes.string).isRequired,
-    shapeRequired: React.PropTypes.shape({
-        color: React.PropTypes.string,
-        fontSize: React.PropTypes.number.isRequired,
-    }).isRequired,
-};
diff --git a/test/react-stateless-function-make-props-transform/stateless-function/output.tsx b/test/react-stateless-function-make-props-transform/stateless-function/output.tsx
deleted file mode 100644
index ba53855..0000000
--- a/test/react-stateless-function-make-props-transform/stateless-function/output.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-type HelloProps = {
-    message?: string;
-};
-const Hello: React.SFC<HelloProps> = ({ message }) => {
-    return <div>hello {message}</div>;
-};
-Hello.propTypes = {
-    message: React.PropTypes.string,
-};
diff --git a/test/react-stateless-function-make-props-transform/stateless-propless/output.tsx b/test/react-stateless-function-make-props-transform/stateless-propless/output.tsx
deleted file mode 100644
index c0f444c..0000000
--- a/test/react-stateless-function-make-props-transform/stateless-propless/output.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-const Hello1 = ({ message }) => {
-    return <div>hello {message}</div>;
-};
-function Hello2({ message }) {
-    return <div>hello {message}</div>;
-}
diff --git a/test/runner.ts b/test/runner.ts
index 864d20f..c1c2ac8 100644
--- a/test/runner.ts
+++ b/test/runner.ts
@@ -36,11 +36,10 @@ for (const [testFolderName, getFactory] of transformToFolderMap) {
         for (const folderName of fs.readdirSync(path.join(__dirname, testFolderName))) {
             const folder = path.join(path.join(__dirname, testFolderName, folderName));
             if (fs.statSync(folder).isDirectory()) {
-                it(`${testFolderName} ${folderName}`, async () => {
+                it(`${testFolderName} ${folderName}`, () => {
                     const inputPath = path.join(folder, 'input.tsx');
-                    const output = await readFile(path.join(folder, 'output.tsx'));
                     const result = compile(inputPath, getFactory);
-                    expect(stripEmptyLines(result)).toEqual(stripEmptyLines(output));
+                    expect(stripEmptyLines(result)).toMatchSnapshot();
                 });
             }
         }