diff --git a/test/fixtures/generation/comment/2-space-multi-comment/actual.js b/test/fixtures/generation/comments/2-space-multi-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/2-space-multi-comment/actual.js
rename to test/fixtures/generation/comments/2-space-multi-comment/actual.js
diff --git a/test/fixtures/generation/comment/2-space-multi-comment/expected.js b/test/fixtures/generation/comments/2-space-multi-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/2-space-multi-comment/expected.js
rename to test/fixtures/generation/comments/2-space-multi-comment/expected.js
diff --git a/test/fixtures/generation/comment/block-line-comment/actual.js b/test/fixtures/generation/comments/block-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/block-line-comment/actual.js
rename to test/fixtures/generation/comments/block-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/block-line-comment/expected.js b/test/fixtures/generation/comments/block-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/block-line-comment/expected.js
rename to test/fixtures/generation/comments/block-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/comment-only/actual.js b/test/fixtures/generation/comments/comment-only/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/comment-only/actual.js
rename to test/fixtures/generation/comments/comment-only/actual.js
diff --git a/test/fixtures/generation/comment/comment-only/expected.js b/test/fixtures/generation/comments/comment-only/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/comment-only/expected.js
rename to test/fixtures/generation/comments/comment-only/expected.js
diff --git a/test/fixtures/generation/comment/computed-property-comments-2/actual.js b/test/fixtures/generation/comments/computed-property-comments-2/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/computed-property-comments-2/actual.js
rename to test/fixtures/generation/comments/computed-property-comments-2/actual.js
diff --git a/test/fixtures/generation/comment/computed-property-comments-2/expected.js b/test/fixtures/generation/comments/computed-property-comments-2/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/computed-property-comments-2/expected.js
rename to test/fixtures/generation/comments/computed-property-comments-2/expected.js
diff --git a/test/fixtures/generation/comment/computed-property-comments/actual.js b/test/fixtures/generation/comments/computed-property-comments/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/computed-property-comments/actual.js
rename to test/fixtures/generation/comments/computed-property-comments/actual.js
diff --git a/test/fixtures/generation/comment/computed-property-comments/expected.js b/test/fixtures/generation/comments/computed-property-comments/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/computed-property-comments/expected.js
rename to test/fixtures/generation/comments/computed-property-comments/expected.js
diff --git a/test/fixtures/generation/comment/do-while-line-comment/actual.js b/test/fixtures/generation/comments/do-while-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/do-while-line-comment/actual.js
rename to test/fixtures/generation/comments/do-while-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/do-while-line-comment/expected.js b/test/fixtures/generation/comments/do-while-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/do-while-line-comment/expected.js
rename to test/fixtures/generation/comments/do-while-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/empty-line-comment/actual.js b/test/fixtures/generation/comments/empty-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/empty-line-comment/actual.js
rename to test/fixtures/generation/comments/empty-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/empty-line-comment/expected.js b/test/fixtures/generation/comments/empty-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/empty-line-comment/expected.js
rename to test/fixtures/generation/comments/empty-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/empty/actual.js b/test/fixtures/generation/comments/empty/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/empty/actual.js
rename to test/fixtures/generation/comments/empty/actual.js
diff --git a/test/fixtures/generation/comment/empty/expected.js b/test/fixtures/generation/comments/empty/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/empty/expected.js
rename to test/fixtures/generation/comments/empty/expected.js
diff --git a/test/fixtures/generation/comment/function-block-line-comment/actual.js b/test/fixtures/generation/comments/function-block-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/function-block-line-comment/actual.js
rename to test/fixtures/generation/comments/function-block-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/function-block-line-comment/expected.js b/test/fixtures/generation/comments/function-block-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/function-block-line-comment/expected.js
rename to test/fixtures/generation/comments/function-block-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/if-block-line-comment/actual.js b/test/fixtures/generation/comments/if-block-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/if-block-line-comment/actual.js
rename to test/fixtures/generation/comments/if-block-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/if-block-line-comment/expected.js b/test/fixtures/generation/comments/if-block-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/if-block-line-comment/expected.js
rename to test/fixtures/generation/comments/if-block-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/if-empty-line-comment/actual.js b/test/fixtures/generation/comments/if-empty-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/if-empty-line-comment/actual.js
rename to test/fixtures/generation/comments/if-empty-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/if-empty-line-comment/expected.js b/test/fixtures/generation/comments/if-empty-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/if-empty-line-comment/expected.js
rename to test/fixtures/generation/comments/if-empty-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/if-line-comment/actual.js b/test/fixtures/generation/comments/if-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/if-line-comment/actual.js
rename to test/fixtures/generation/comments/if-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/if-line-comment/expected.js b/test/fixtures/generation/comments/if-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/if-line-comment/expected.js
rename to test/fixtures/generation/comments/if-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/object_comments/actual.js b/test/fixtures/generation/comments/object_comments/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/object_comments/actual.js
rename to test/fixtures/generation/comments/object_comments/actual.js
diff --git a/test/fixtures/generation/comment/object_comments/expected.js b/test/fixtures/generation/comments/object_comments/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/object_comments/expected.js
rename to test/fixtures/generation/comments/object_comments/expected.js
diff --git a/test/fixtures/generation/comment/return-no-argument/actual.js b/test/fixtures/generation/comments/return-no-argument/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/return-no-argument/actual.js
rename to test/fixtures/generation/comments/return-no-argument/actual.js
diff --git a/test/fixtures/generation/comment/return-no-argument/expected.js b/test/fixtures/generation/comments/return-no-argument/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/return-no-argument/expected.js
rename to test/fixtures/generation/comments/return-no-argument/expected.js
diff --git a/test/fixtures/generation/comment/simple-a-lot-of-line-comment/actual.js b/test/fixtures/generation/comments/simple-a-lot-of-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-a-lot-of-line-comment/actual.js
rename to test/fixtures/generation/comments/simple-a-lot-of-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/simple-a-lot-of-line-comment/expected.js b/test/fixtures/generation/comments/simple-a-lot-of-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-a-lot-of-line-comment/expected.js
rename to test/fixtures/generation/comments/simple-a-lot-of-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/simple-a-lot-of-multi-comment/actual.js b/test/fixtures/generation/comments/simple-a-lot-of-multi-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-a-lot-of-multi-comment/actual.js
rename to test/fixtures/generation/comments/simple-a-lot-of-multi-comment/actual.js
diff --git a/test/fixtures/generation/comment/simple-a-lot-of-multi-comment/expected.js b/test/fixtures/generation/comments/simple-a-lot-of-multi-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-a-lot-of-multi-comment/expected.js
rename to test/fixtures/generation/comments/simple-a-lot-of-multi-comment/expected.js
diff --git a/test/fixtures/generation/comment/simple-line-comment/actual.js b/test/fixtures/generation/comments/simple-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-line-comment/actual.js
rename to test/fixtures/generation/comments/simple-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/simple-line-comment/expected.js b/test/fixtures/generation/comments/simple-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-line-comment/expected.js
rename to test/fixtures/generation/comments/simple-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/simple-multi-comment/actual.js b/test/fixtures/generation/comments/simple-multi-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-multi-comment/actual.js
rename to test/fixtures/generation/comments/simple-multi-comment/actual.js
diff --git a/test/fixtures/generation/comment/simple-multi-comment/expected.js b/test/fixtures/generation/comments/simple-multi-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-multi-comment/expected.js
rename to test/fixtures/generation/comments/simple-multi-comment/expected.js
diff --git a/test/fixtures/generation/comment/simple-statement-comment/actual.js b/test/fixtures/generation/comments/simple-statement-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-statement-comment/actual.js
rename to test/fixtures/generation/comments/simple-statement-comment/actual.js
diff --git a/test/fixtures/generation/comment/simple-statement-comment/expected.js b/test/fixtures/generation/comments/simple-statement-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/simple-statement-comment/expected.js
rename to test/fixtures/generation/comments/simple-statement-comment/expected.js
diff --git a/test/fixtures/generation/comment/try-block-line-comment/actual.js b/test/fixtures/generation/comments/try-block-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/try-block-line-comment/actual.js
rename to test/fixtures/generation/comments/try-block-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/try-block-line-comment/expected.js b/test/fixtures/generation/comments/try-block-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/try-block-line-comment/expected.js
rename to test/fixtures/generation/comments/try-block-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/variable-declarator-line-comment/actual.js b/test/fixtures/generation/comments/variable-declarator-line-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/variable-declarator-line-comment/actual.js
rename to test/fixtures/generation/comments/variable-declarator-line-comment/actual.js
diff --git a/test/fixtures/generation/comment/variable-declarator-line-comment/expected.js b/test/fixtures/generation/comments/variable-declarator-line-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/variable-declarator-line-comment/expected.js
rename to test/fixtures/generation/comments/variable-declarator-line-comment/expected.js
diff --git a/test/fixtures/generation/comment/variable-declarator-multi-comment/actual.js b/test/fixtures/generation/comments/variable-declarator-multi-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/variable-declarator-multi-comment/actual.js
rename to test/fixtures/generation/comments/variable-declarator-multi-comment/actual.js
diff --git a/test/fixtures/generation/comment/variable-declarator-multi-comment/expected.js b/test/fixtures/generation/comments/variable-declarator-multi-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/variable-declarator-multi-comment/expected.js
rename to test/fixtures/generation/comments/variable-declarator-multi-comment/expected.js
diff --git a/test/fixtures/generation/comment/variable-declarator-trailing-comment/actual.js b/test/fixtures/generation/comments/variable-declarator-trailing-comment/actual.js
similarity index 100%
rename from test/fixtures/generation/comment/variable-declarator-trailing-comment/actual.js
rename to test/fixtures/generation/comments/variable-declarator-trailing-comment/actual.js
diff --git a/test/fixtures/generation/comment/variable-declarator-trailing-comment/expected.js b/test/fixtures/generation/comments/variable-declarator-trailing-comment/expected.js
similarity index 100%
rename from test/fixtures/generation/comment/variable-declarator-trailing-comment/expected.js
rename to test/fixtures/generation/comments/variable-declarator-trailing-comment/expected.js
diff --git a/test/fixtures/generation/basic/bitwise-precedence/actual.js b/test/fixtures/generation/edgecase/bitwise-precedence/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/bitwise-precedence/actual.js
rename to test/fixtures/generation/edgecase/bitwise-precedence/actual.js
diff --git a/test/fixtures/generation/basic/bitwise-precedence/expected.js b/test/fixtures/generation/edgecase/bitwise-precedence/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/bitwise-precedence/expected.js
rename to test/fixtures/generation/edgecase/bitwise-precedence/expected.js
diff --git a/test/fixtures/generation/basic/floating-point/actual.js b/test/fixtures/generation/edgecase/floating-point/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/floating-point/actual.js
rename to test/fixtures/generation/edgecase/floating-point/actual.js
diff --git a/test/fixtures/generation/basic/floating-point/expected.js b/test/fixtures/generation/edgecase/floating-point/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/floating-point/expected.js
rename to test/fixtures/generation/edgecase/floating-point/expected.js
diff --git a/test/fixtures/generation/basic/for-in-no-in/actual.js b/test/fixtures/generation/edgecase/for-in-no-in/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/for-in-no-in/actual.js
rename to test/fixtures/generation/edgecase/for-in-no-in/actual.js
diff --git a/test/fixtures/generation/basic/for-in-no-in/expected.js b/test/fixtures/generation/edgecase/for-in-no-in/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/for-in-no-in/expected.js
rename to test/fixtures/generation/edgecase/for-in-no-in/expected.js
diff --git a/test/fixtures/generation/basic/new-precedence/actual.js b/test/fixtures/generation/edgecase/new-precedence/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/new-precedence/actual.js
rename to test/fixtures/generation/edgecase/new-precedence/actual.js
diff --git a/test/fixtures/generation/basic/new-precedence/expected.js b/test/fixtures/generation/edgecase/new-precedence/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/new-precedence/expected.js
rename to test/fixtures/generation/edgecase/new-precedence/expected.js
diff --git a/test/fixtures/generation/basic/one-property-with-line-terminator/actual.js b/test/fixtures/generation/edgecase/one-property-with-line-terminator/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/one-property-with-line-terminator/actual.js
rename to test/fixtures/generation/edgecase/one-property-with-line-terminator/actual.js
diff --git a/test/fixtures/generation/basic/one-property-with-line-terminator/expected.js b/test/fixtures/generation/edgecase/one-property-with-line-terminator/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/one-property-with-line-terminator/expected.js
rename to test/fixtures/generation/edgecase/one-property-with-line-terminator/expected.js
diff --git a/test/fixtures/generation/basic/unary-op/actual.js b/test/fixtures/generation/edgecase/unary-op/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/unary-op/actual.js
rename to test/fixtures/generation/edgecase/unary-op/actual.js
diff --git a/test/fixtures/generation/basic/unary-op/expected.js b/test/fixtures/generation/edgecase/unary-op/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/unary-op/expected.js
rename to test/fixtures/generation/edgecase/unary-op/expected.js
diff --git a/test/fixtures/generation/basic/unnecessary-parenthesized-in-2/actual.js b/test/fixtures/generation/edgecase/unnecessary-parenthesized-in-2/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/unnecessary-parenthesized-in-2/actual.js
rename to test/fixtures/generation/edgecase/unnecessary-parenthesized-in-2/actual.js
diff --git a/test/fixtures/generation/basic/unnecessary-parenthesized-in-2/expected.js b/test/fixtures/generation/edgecase/unnecessary-parenthesized-in-2/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/unnecessary-parenthesized-in-2/expected.js
rename to test/fixtures/generation/edgecase/unnecessary-parenthesized-in-2/expected.js
diff --git a/test/fixtures/generation/basic/unnecessary-parenthesized-in/actual.js b/test/fixtures/generation/edgecase/unnecessary-parenthesized-in/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/unnecessary-parenthesized-in/actual.js
rename to test/fixtures/generation/edgecase/unnecessary-parenthesized-in/actual.js
diff --git a/test/fixtures/generation/basic/unnecessary-parenthesized-in/expected.js b/test/fixtures/generation/edgecase/unnecessary-parenthesized-in/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/unnecessary-parenthesized-in/expected.js
rename to test/fixtures/generation/edgecase/unnecessary-parenthesized-in/expected.js
diff --git a/test/fixtures/generation/basic/variable-declaration/actual.js b/test/fixtures/generation/edgecase/variable-declaration/actual.js
similarity index 100%
rename from test/fixtures/generation/basic/variable-declaration/actual.js
rename to test/fixtures/generation/edgecase/variable-declaration/actual.js
diff --git a/test/fixtures/generation/basic/variable-declaration/expected.js b/test/fixtures/generation/edgecase/variable-declaration/expected.js
similarity index 100%
rename from test/fixtures/generation/basic/variable-declaration/expected.js
rename to test/fixtures/generation/edgecase/variable-declaration/expected.js
diff --git a/test/fixtures/generation/harmony/arrow-function/actual.js b/test/fixtures/generation/harmony-edgecase/arrow-function/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/arrow-function/actual.js
rename to test/fixtures/generation/harmony-edgecase/arrow-function/actual.js
diff --git a/test/fixtures/generation/harmony/arrow-function/expected.js b/test/fixtures/generation/harmony-edgecase/arrow-function/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/arrow-function/expected.js
rename to test/fixtures/generation/harmony-edgecase/arrow-function/expected.js
diff --git a/test/fixtures/generation/harmony/class-declaration/actual.js b/test/fixtures/generation/harmony-edgecase/class-declaration/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/class-declaration/actual.js
rename to test/fixtures/generation/harmony-edgecase/class-declaration/actual.js
diff --git a/test/fixtures/generation/harmony/class-declaration/expected.js b/test/fixtures/generation/harmony-edgecase/class-declaration/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/class-declaration/expected.js
rename to test/fixtures/generation/harmony-edgecase/class-declaration/expected.js
diff --git a/test/fixtures/generation/harmony/class-expression/actual.js b/test/fixtures/generation/harmony-edgecase/class-expression/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/class-expression/actual.js
rename to test/fixtures/generation/harmony-edgecase/class-expression/actual.js
diff --git a/test/fixtures/generation/harmony/class-expression/expected.js b/test/fixtures/generation/harmony-edgecase/class-expression/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/class-expression/expected.js
rename to test/fixtures/generation/harmony-edgecase/class-expression/expected.js
diff --git a/test/fixtures/generation/harmony/computed-property/actual.js b/test/fixtures/generation/harmony-edgecase/computed-property/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/computed-property/actual.js
rename to test/fixtures/generation/harmony-edgecase/computed-property/actual.js
diff --git a/test/fixtures/generation/harmony/computed-property/expected.js b/test/fixtures/generation/harmony-edgecase/computed-property/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/computed-property/expected.js
rename to test/fixtures/generation/harmony-edgecase/computed-property/expected.js
diff --git a/test/fixtures/generation/harmony/default-parameter/actual.js b/test/fixtures/generation/harmony-edgecase/default-parameter/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/default-parameter/actual.js
rename to test/fixtures/generation/harmony-edgecase/default-parameter/actual.js
diff --git a/test/fixtures/generation/harmony/default-parameter/expected.js b/test/fixtures/generation/harmony-edgecase/default-parameter/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/default-parameter/expected.js
rename to test/fixtures/generation/harmony-edgecase/default-parameter/expected.js
diff --git a/test/fixtures/generation/harmony/destructuring-assignment/actual.js b/test/fixtures/generation/harmony-edgecase/destructuring-assignment/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/destructuring-assignment/actual.js
rename to test/fixtures/generation/harmony-edgecase/destructuring-assignment/actual.js
diff --git a/test/fixtures/generation/harmony/destructuring-assignment/expected.js b/test/fixtures/generation/harmony-edgecase/destructuring-assignment/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/destructuring-assignment/expected.js
rename to test/fixtures/generation/harmony-edgecase/destructuring-assignment/expected.js
diff --git a/test/fixtures/generation/harmony/export-default-declaration/actual.js b/test/fixtures/generation/harmony-edgecase/export-default-declaration/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/export-default-declaration/actual.js
rename to test/fixtures/generation/harmony-edgecase/export-default-declaration/actual.js
diff --git a/test/fixtures/generation/harmony/export-default-declaration/expected.js b/test/fixtures/generation/harmony-edgecase/export-default-declaration/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/export-default-declaration/expected.js
rename to test/fixtures/generation/harmony-edgecase/export-default-declaration/expected.js
diff --git a/test/fixtures/generation/harmony/exports/actual.js b/test/fixtures/generation/harmony-edgecase/exports/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/exports/actual.js
rename to test/fixtures/generation/harmony-edgecase/exports/actual.js
diff --git a/test/fixtures/generation/harmony/exports/expected.js b/test/fixtures/generation/harmony-edgecase/exports/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/exports/expected.js
rename to test/fixtures/generation/harmony-edgecase/exports/expected.js
diff --git a/test/fixtures/generation/harmony/for-of-statement/actual.js b/test/fixtures/generation/harmony-edgecase/for-of-statement/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/for-of-statement/actual.js
rename to test/fixtures/generation/harmony-edgecase/for-of-statement/actual.js
diff --git a/test/fixtures/generation/harmony/for-of-statement/expected.js b/test/fixtures/generation/harmony-edgecase/for-of-statement/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/for-of-statement/expected.js
rename to test/fixtures/generation/harmony-edgecase/for-of-statement/expected.js
diff --git a/test/fixtures/generation/harmony/import-with-default/actual.js b/test/fixtures/generation/harmony-edgecase/import-with-default/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/import-with-default/actual.js
rename to test/fixtures/generation/harmony-edgecase/import-with-default/actual.js
diff --git a/test/fixtures/generation/harmony/import-with-default/expected.js b/test/fixtures/generation/harmony-edgecase/import-with-default/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/import-with-default/expected.js
rename to test/fixtures/generation/harmony-edgecase/import-with-default/expected.js
diff --git a/test/fixtures/generation/harmony/imports/actual.js b/test/fixtures/generation/harmony-edgecase/imports/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/imports/actual.js
rename to test/fixtures/generation/harmony-edgecase/imports/actual.js
diff --git a/test/fixtures/generation/harmony/imports/expected.js b/test/fixtures/generation/harmony-edgecase/imports/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/imports/expected.js
rename to test/fixtures/generation/harmony-edgecase/imports/expected.js
diff --git a/test/fixtures/generation/harmony/one-assignment-property/actual.js b/test/fixtures/generation/harmony-edgecase/one-assignment-property/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/one-assignment-property/actual.js
rename to test/fixtures/generation/harmony-edgecase/one-assignment-property/actual.js
diff --git a/test/fixtures/generation/harmony/one-assignment-property/expected.js b/test/fixtures/generation/harmony-edgecase/one-assignment-property/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/one-assignment-property/expected.js
rename to test/fixtures/generation/harmony-edgecase/one-assignment-property/expected.js
diff --git a/test/fixtures/generation/harmony/spread-element/actual.js b/test/fixtures/generation/harmony-edgecase/spread-element/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/spread-element/actual.js
rename to test/fixtures/generation/harmony-edgecase/spread-element/actual.js
diff --git a/test/fixtures/generation/harmony/spread-element/expected.js b/test/fixtures/generation/harmony-edgecase/spread-element/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/spread-element/expected.js
rename to test/fixtures/generation/harmony-edgecase/spread-element/expected.js
diff --git a/test/fixtures/generation/harmony/templates-escape/actual.js b/test/fixtures/generation/harmony-edgecase/templates-escape/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/templates-escape/actual.js
rename to test/fixtures/generation/harmony-edgecase/templates-escape/actual.js
diff --git a/test/fixtures/generation/harmony/templates-escape/expected.js b/test/fixtures/generation/harmony-edgecase/templates-escape/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/templates-escape/expected.js
rename to test/fixtures/generation/harmony-edgecase/templates-escape/expected.js
diff --git a/test/fixtures/generation/harmony/templates/actual.js b/test/fixtures/generation/harmony-edgecase/templates/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/templates/actual.js
rename to test/fixtures/generation/harmony-edgecase/templates/actual.js
diff --git a/test/fixtures/generation/harmony/templates/expected.js b/test/fixtures/generation/harmony-edgecase/templates/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/templates/expected.js
rename to test/fixtures/generation/harmony-edgecase/templates/expected.js
diff --git a/test/fixtures/generation/harmony/yield-precedence/actual.js b/test/fixtures/generation/harmony-edgecase/yield-precedence/actual.js
similarity index 100%
rename from test/fixtures/generation/harmony/yield-precedence/actual.js
rename to test/fixtures/generation/harmony-edgecase/yield-precedence/actual.js
diff --git a/test/fixtures/generation/harmony/yield-precedence/expected.js b/test/fixtures/generation/harmony-edgecase/yield-precedence/expected.js
similarity index 100%
rename from test/fixtures/generation/harmony/yield-precedence/expected.js
rename to test/fixtures/generation/harmony-edgecase/yield-precedence/expected.js