From 94aa3e53ca5c4e3475669c072179b29c8800c0a2 Mon Sep 17 00:00:00 2001
From: Estevao Soares dos Santos <estevao.santos@gmail.com>
Date: Sat, 23 Dec 2017 12:35:31 +0000
Subject: [PATCH] test: add tests for reverse converter

---
 src/converter.js                              | 69 ++++++++++-----
 src/helpers.js                                | 13 +++
 .../#143.support-image-dimensions.html        |  0
 .../features/#143.support-image-dimensions.md |  0
 .../features/#164.1.simple-autolink.html      |  0
 .../cases/features/#164.1.simple-autolink.md  |  0
 ...disallow-underscore-emphasis-mid-word.html |  0
 ...2.disallow-underscore-emphasis-mid-word.md |  0
 .../cases/features/#164.3.strikethrough.html  |  0
 .../cases/features/#164.3.strikethrough.md    |  0
 .../cases/features/#164.4.tasklists.html      |  0
 .../cases/features/#164.4.tasklists.md        |  0
 ...8.markdown-inside-html-does-not-parse.html |  0
 ...178.markdown-inside-html-does-not-parse.md |  0
 ...erscores-changes-behavior-of-asterisk.html |  0
 ...nderscores-changes-behavior-of-asterisk.md |  0
 ...rtain-links-with-at-and-dot-break-url.html |  0
 ...certain-links-with-at-and-dot-break-url.md |  0
 .../#206.treat-single-line-breaks-as-br.html  |  0
 .../#206.treat-single-line-breaks-as-br.md    |  0
 ...ed-markdown-chars-break-strikethrough.html |  0
 ...aped-markdown-chars-break-strikethrough.md |  0
 ...6-template-strings-indentation-issues.html |  0
 ...es6-template-strings-indentation-issues.md |  0
 ...fiedAutoLink-does-not-match-GFM-style.html |  0
 ...lifiedAutoLink-does-not-match-GFM-style.md |  0
 ...-simpleLineBreaks-option-breaks-lists.html |  0
 ...ew-simpleLineBreaks-option-breaks-lists.md |  0
 ...does-not-work-with-chinese-characters.html |  0
 ...s-does-not-work-with-chinese-characters.md |  0
 ...github-compatible-generated-header-id.html |  0
 ...0.github-compatible-generated-header-id.md |  0
 ...3.simpleLineBreaks-breaks-with-strong.html |  0
 ...323.simpleLineBreaks-breaks-with-strong.md |  0
 ...haracter-before-and-after-linked-mail.html |  0
 ...-character-before-and-after-linked-mail.md |  0
 .../#331.allow-escaping-of-tilde.html         |  0
 .../features/#331.allow-escaping-of-tilde.md  |  0
 .../cases/features/#374.escape-html-tags.html |  0
 .../cases/features/#374.escape-html-tags.md   |  0
 ...th-excludeTrailingPunctuationFromURLs.html |  0
 ...with-excludeTrailingPunctuationFromURLs.md |  0
 ...penLinksInNewWindow-breaks-em-markdup.html |  0
 ....openLinksInNewWindow-breaks-em-markdup.md |  0
 ...ats-non-word-characters-as-characters.html |  0
 ...reats-non-word-characters-as-characters.md |  0
 .../features/#69.header-level-start.html      |  0
 .../cases/features/#69.header-level-start.md  |  0
 .../features/completeHTMLOutput/simple.html   |  0
 .../features/completeHTMLOutput/simple.md     |  0
 .../features/customizedHeaderId-simple.html   |  0
 .../features/customizedHeaderId-simple.md     |  0
 .../features/disable-email-encoding.html      |  0
 .../cases/features/disable-email-encoding.md  |  0
 .../cases/features/disable-gh-codeblocks.html |  0
 .../cases/features/disable-gh-codeblocks.md   |  0
 .../disableForced4SpacesIndentedSublists.html |  0
 .../disableForced4SpacesIndentedSublists.md   |  0
 .../.gitkeep                                  |  0
 .../cases/features/emojis/complex.html        |  0
 .../cases/features/emojis/complex.md          |  0
 .../cases/features/emojis/links.html          |  0
 .../cases/features/emojis/links.md            |  0
 .../cases/features/emojis/simple.html         |  0
 .../cases/features/emojis/simple.md           |  0
 .../features/emojis/simplifiedautolinks.html  |  0
 .../features/emojis/simplifiedautolinks.md    |  0
 .../cases/features/emojis/special.html        |  0
 .../cases/features/emojis/special.md          |  0
 ...udeTrailingPunctuationFromURLs-option.html |  0
 ...cludeTrailingPunctuationFromURLs-option.md |  0
 .../cases/features/ghMentions.html            |  0
 .../cases/features/ghMentions.md              |  0
 .../literalMidWordAsterisks/basic.html        |  0
 .../features/literalMidWordAsterisks/basic.md |  0
 .../punctation-test.html                      |  0
 .../punctation-test.md                        |  0
 .../literalMidWordUnderscores/basic.html      |  0
 .../literalMidWordUnderscores/basic.md        |  0
 .../punctation-test.html                      |  0
 .../punctation-test.md                        |  0
 .../features/metadata/dashes-conflict.html    |  0
 .../features/metadata/dashes-conflict.md      |  0
 .../features/metadata/embeded-in-output.html  |  0
 .../features/metadata/embeded-in-output.md    |  0
 ...ive-metadata-blocks-different-symbols.html |  0
 ...utive-metadata-blocks-different-symbols.md |  0
 ...beded-two-consecutive-metadata-blocks.html |  0
 ...embeded-two-consecutive-metadata-blocks.md |  0
 .../features/metadata/ignore-metadata.html    |  0
 .../features/metadata/ignore-metadata.md      |  0
 .../metadata/simple-angled-for-method.html    |  0
 .../metadata/simple-angled-for-method.md      |  0
 .../metadata/simple-angled-quotes.html        |  0
 .../features/metadata/simple-angled-quotes.md |  0
 .../metadata/simple-three-dashes.html         |  0
 .../features/metadata/simple-three-dashes.md  |  0
 .../features/metadata/simple-with-format.html |  0
 .../features/metadata/simple-with-format.md   |  0
 .../hash-links-open-in-same-page.html         |  0
 .../hash-links-open-in-same-page.md           |  0
 .../openLinksInNewWindow/simple-cases.html    |  0
 .../openLinksInNewWindow/simple-cases.md      |  0
 .../features/openLinksInNewWindow/simple.html |  0
 .../features/openLinksInNewWindow/simple.md   |  0
 .../simplifiedAutoLink.html                   |  0
 .../simplifiedAutoLink.md                     |  0
 .../cases/features/prefixHeaderId-simple.html |  0
 .../cases/features/prefixHeaderId-simple.md   |  0
 ...derId-string-and-ghCompatibleHeaderId.html |  0
 ...eaderId-string-and-ghCompatibleHeaderId.md |  0
 ...erId-string-and-ghCompatibleHeaderId2.html |  0
 ...aderId-string-and-ghCompatibleHeaderId2.md |  0
 .../cases/features/prefixHeaderId-string.html |  0
 .../cases/features/prefixHeaderId-string.md   |  0
 .../cases/features/rawHeaderId/simple.html    |  0
 .../cases/features/rawHeaderId/simple.md      |  0
 .../rawHeaderId/with-prefixHeaderId.html      |  0
 .../rawHeaderId/with-prefixHeaderId.md        |  0
 .../simple-with-prefixHeaderId.html           |  0
 .../simple-with-prefixHeaderId.md             |  0
 .../requireSpaceBeforeHeadingText.html        |  0
 .../features/requireSpaceBeforeHeadingText.md |  0
 .../simpleLineBreaks-handle-html-pre.html     |  0
 .../simpleLineBreaks-handle-html-pre.md       |  0
 .../cases/features/simpleLineBreaks2.html     |  0
 .../cases/features/simpleLineBreaks2.md       |  0
 .../autolinks-with-magic-chars.html           |  0
 .../autolinks-with-magic-chars.md             |  0
 .../simplifiedAutoLink/blockquote.html        |  0
 .../features/simplifiedAutoLink/blockquote.md |  0
 .../disallow-underscores.html                 |  0
 .../disallow-underscores.md                   |  0
 .../does-not-parse-inside-a-tags.html         |  0
 .../does-not-parse-inside-a-tags.md           |  0
 .../does-not-parse-inside-code.html           |  0
 .../does-not-parse-inside-code.md             |  0
 .../does-not-parse-reference-links.html       |  0
 .../does-not-parse-reference-links.md         |  0
 .../emphasis-and-strikethrough.html           |  0
 .../emphasis-and-strikethrough.md             |  0
 .../simplifiedAutoLink/ordered-lists.html     |  0
 .../simplifiedAutoLink/ordered-lists.md       |  0
 .../features/simplifiedAutoLink/text.html     |  0
 .../cases/features/simplifiedAutoLink/text.md |  0
 .../simplifiedAutoLink/unordered-lists.html   |  0
 .../simplifiedAutoLink/unordered-lists.md     |  0
 .../splitAdjacentBlockquotes/basic.html       |  0
 .../splitAdjacentBlockquotes/basic.md         |  0
 .../multiline-paragraph.html                  |  0
 .../multiline-paragraph.md                    |  0
 .../tables/#179.parse-md-in-table-ths.html    |  0
 .../tables/#179.parse-md-in-table-ths.md      |  0
 ...eparators-should-not-require-3-dashes.html |  0
 ...-separators-should-not-require-3-dashes.md |  0
 .../tables/#345.escape-pipe-character.html    |  0
 .../tables/#345.escape-pipe-character.md      |  0
 ...406.does-not-render-one-column-tables.html |  0
 .../#406.does-not-render-one-column-tables.md |  0
 ...ailing-spaces-break-one-column-tables.html |  0
 ...trailing-spaces-break-one-column-tables.md |  0
 ...owed-by-list-does-not-parse-correctly.html |  0
 ...llowed-by-list-does-not-parse-correctly.md |  0
 ...owed-by-list-does-not-parse-correctly.html |  0
 ...llowed-by-list-does-not-parse-correctly.md |  0
 ...465.code-spans-with-pipes-break-table.html |  0
 .../#465.code-spans-with-pipes-break-table.md |  0
 ...s-not-rendered-correctly-inside-table.html |  0
 ...-is-not-rendered-correctly-inside-table.md |  0
 .../features/tables/basic-alignment.html      |  0
 .../cases/features/tables/basic-alignment.md  |  0
 .../tables/basic-with-header-ids.html         |  0
 .../features/tables/basic-with-header-ids.md  |  0
 .../cases/features/tables/basic.html          |  0
 .../cases/features/tables/basic.md            |  0
 .../features/tables/gh-style-tables.html      |  0
 .../cases/features/tables/gh-style-tables.md  |  0
 .../tables/large-table-with-allignments.html  |  0
 .../tables/large-table-with-allignments.md    |  0
 .../cases/features/tables/large.html          |  0
 .../cases/features/tables/large.md            |  0
 .../features/tables/mixed-alignment.html      |  0
 .../cases/features/tables/mixed-alignment.md  |  0
 .../features/tables/multiple-tables.html      |  0
 .../cases/features/tables/multiple-tables.md  |  0
 .../tables/table-inside-codeblock.html        |  0
 .../features/tables/table-inside-codeblock.md |  0
 .../tables/table-without-leading-pipe.html    |  0
 .../tables/table-without-leading-pipe.md      |  0
 .../cases/features/tables/with-equals.html    |  0
 .../cases/features/tables/with-equals.md      |  0
 .../features/tables/with-span-elements.html   |  0
 .../features/tables/with-span-elements.md     |  0
 .../features/tables/with-surroundings.html    |  0
 .../features/tables/with-surroundings.md      |  0
 .../cases/features/tables/without-body.html   |  0
 .../cases/features/tables/without-body.md     |  0
 .../tables/without-header-delimiter.html      |  0
 .../tables/without-header-delimiter.md        |  0
 .../cases/features/underline/fulltext.html    |  0
 .../cases/features/underline/fulltext.md      |  0
 .../cases/features/underline/simple.html      |  0
 .../cases/features/underline/simple.md        |  0
 .../cases/ghost/markdown-magic.html           |  0
 .../cases/ghost/markdown-magic.md             |  0
 .../cases/ghost/underscore.html               |  0
 .../{ => makehtml}/cases/ghost/underscore.md  |  0
 .../#107.inner-underscore-parse-to-block.html |  0
 .../#107.inner-underscore-parse-to-block.md   |  0
 ...aviour-for-multiple-consecutive-lists.html |  0
 ...ehaviour-for-multiple-consecutive-lists.md |  0
 .../#150.hyphens-are-getting-removed.html     |  0
 .../#150.hyphens-are-getting-removed.md       |  0
 ...s-within-lists-do-not-render-properly.html |  0
 ...cks-within-lists-do-not-render-properly.md |  0
 ...191.blockquote-followed-by-an-heading.html |  0
 .../#191.blockquote-followed-by-an-heading.md |  0
 ...6.entity-in-code-block-in-nested-list.html |  0
 ...196.entity-in-code-block-in-nested-list.md |  0
 .../#220.html-breaks-markdown-parsing.html    |  0
 .../#220.html-breaks-markdown-parsing.md      |  0
 ...de-being-parsed-inside-HTML-code-tags.html |  0
 ...code-being-parsed-inside-HTML-code-tags.md |  0
 ...de-being-parsed-inside-HTML-code-tags.html |  0
 ...code-being-parsed-inside-HTML-code-tags.md |  0
 ...agraphs-are-ignored-between-code-tags.html |  0
 ...aragraphs-are-ignored-between-code-tags.md |  0
 ...rong-lt-parsing-when-attached-to-word.html |  0
 ....wrong-lt-parsing-when-attached-to-word.md |  0
 .../issues/#261.mix-images-with-links.html    |  0
 .../issues/#261.mix-images-with-links.md      |  0
 ...-style-image-does-not-work-correctely.html |  0
 ...ne-style-image-does-not-work-correctely.md |  0
 ...e-style-link-does-not-work-correctely.html |  0
 ...ine-style-link-does-not-work-correctely.md |  0
 ...d-correctly-when-nested-in-list-items.html |  0
 ...ted-correctly-when-nested-in-list-items.md |  0
 ...nordered-list-inconsistent-behavior-2.html |  0
 ...-unordered-list-inconsistent-behavior-2.md |  0
 ...nordered-list-inconsistent-behavior-3.html |  0
 ...-unordered-list-inconsistent-behavior-3.md |  0
 ...-unordered-list-inconsistent-behavior.html |  0
 ...ed-unordered-list-inconsistent-behavior.md |  0
 .../#312.spaced-dashes-followed-by-char.html  |  0
 .../#312.spaced-dashes-followed-by-char.md    |  0
 .../#312.spaced-dashes-followed-by-char2.html |  0
 .../#312.spaced-dashes-followed-by-char2.md   |  0
 .../#312.spaced-dashes-followed-by-char3.html |  0
 .../#312.spaced-dashes-followed-by-char3.md   |  0
 .../#312.spaced-dashes-followed-by-char4.html |  0
 .../#312.spaced-dashes-followed-by-char4.md   |  0
 .../cases/issues/#317.spaces-before-hr.html   |  0
 .../cases/issues/#317.spaces-before-hr.md     |  0
 ...stent-behavior-of-emphasis-and-strong.html |  0
 ...sistent-behavior-of-emphasis-and-strong.md |  0
 ...#345.no-escape-for-the-pipe-character.html |  0
 .../#345.no-escape-for-the-pipe-character.md  |  0
 .../#390.brackets-in-URL-break-images.html    |  0
 .../#390.brackets-in-URL-break-images.md      |  0
 .../#390.brackets-in-URL-break-links.html     |  0
 .../#390.brackets-in-URL-break-links.md       |  0
 ...93.showdown-hangs-with-malformed-html.html |  0
 ...#393.showdown-hangs-with-malformed-html.md |  0
 .../#397.unordered-list-strange-behavior.html |  0
 .../#397.unordered-list-strange-behavior.md   |  0
 .../#429.multiline-base64-image-support.html  |  0
 .../#429.multiline-base64-image-support.md    |  0
 .../#467.header-ids-for-subheadings.html      |  0
 .../issues/#467.header-ids-for-subheadings.md |  0
 ...83.parsed-text-links-with-underscores.html |  0
 .../#83.parsed-text-links-with-underscores.md |  0
 .../issues/#96.underscores-in-links.html      |  0
 .../cases/issues/#96.underscores-in-links.md  |  0
 .../URLs-with-multiple-parenthesis.html       |  0
 .../issues/URLs-with-multiple-parenthesis.md  |  0
 .../cases/issues/crazy-urls.html              |  0
 .../{ => makehtml}/cases/issues/crazy-urls.md |  0
 .../issues/deeply-nested-HTML-blocks.html     |  0
 .../cases/issues/deeply-nested-HTML-blocks.md |  0
 .../cases/issues/handle-html-pre.html         |  0
 .../cases/issues/handle-html-pre.md           |  0
 .../cases/issues/one-line-HTML-input.html     |  0
 .../cases/issues/one-line-HTML-input.md       |  0
 .../2-paragraphs-hard-return-spaces.html      |  0
 .../2-paragraphs-hard-return-spaces.md        |  0
 .../karlcow/2-paragraphs-hard-return.html     |  0
 .../cases/karlcow/2-paragraphs-hard-return.md |  0
 .../karlcow/2-paragraphs-line-returns.html    |  0
 .../karlcow/2-paragraphs-line-returns.md      |  0
 .../karlcow/2-paragraphs-line-spaces.html     |  0
 .../cases/karlcow/2-paragraphs-line-spaces.md |  0
 .../cases/karlcow/2-paragraphs-line-tab.html  |  0
 .../cases/karlcow/2-paragraphs-line-tab.md    |  0
 .../cases/karlcow/2-paragraphs-line.html      |  0
 .../cases/karlcow/2-paragraphs-line.md        |  0
 .../cases/karlcow/EOL-CR+LF.html              |  0
 .../{ => makehtml}/cases/karlcow/EOL-CR+LF.md |  0
 .../{ => makehtml}/cases/karlcow/EOL-CR.html  |  0
 .../{ => makehtml}/cases/karlcow/EOL-CR.md    |  0
 .../{ => makehtml}/cases/karlcow/EOL-LF.html  |  0
 .../{ => makehtml}/cases/karlcow/EOL-LF.md    |  0
 .../cases/karlcow/ampersand-text-flow.html    |  0
 .../cases/karlcow/ampersand-text-flow.md      |  0
 .../cases/karlcow/ampersand-uri.html          |  0
 .../cases/karlcow/ampersand-uri.md            |  0
 .../cases/karlcow/asterisk-near-text.html     |  0
 .../cases/karlcow/asterisk-near-text.md       |  0
 .../cases/karlcow/asterisk.html               |  0
 .../{ => makehtml}/cases/karlcow/asterisk.md  |  0
 .../cases/karlcow/backslash-escape.html       |  0
 .../cases/karlcow/backslash-escape.md         |  0
 .../karlcow/blockquote-added-markup.html      |  0
 .../cases/karlcow/blockquote-added-markup.md  |  0
 .../karlcow/blockquote-line-2-paragraphs.html |  0
 .../karlcow/blockquote-line-2-paragraphs.md   |  0
 .../cases/karlcow/blockquote-line.html        |  0
 .../cases/karlcow/blockquote-line.md          |  0
 .../blockquote-multiline-1-space-begin.html   |  0
 .../blockquote-multiline-1-space-begin.md     |  0
 .../blockquote-multiline-1-space-end.html     |  0
 .../blockquote-multiline-1-space-end.md       |  0
 .../blockquote-multiline-2-paragraphs.html    |  0
 .../blockquote-multiline-2-paragraphs.md      |  0
 .../cases/karlcow/blockquote-multiline.html   |  0
 .../cases/karlcow/blockquote-multiline.md     |  0
 ...ockquote-nested-multiplereturn-level1.html |  0
 ...blockquote-nested-multiplereturn-level1.md |  0
 .../blockquote-nested-multiplereturn.html     |  0
 .../blockquote-nested-multiplereturn.md       |  0
 .../blockquote-nested-return-level1.html      |  0
 .../blockquote-nested-return-level1.md        |  0
 .../cases/karlcow/blockquote-nested.html      |  0
 .../cases/karlcow/blockquote-nested.md        |  0
 .../cases/karlcow/code-1-tab.html             |  0
 .../cases/karlcow/code-1-tab.md               |  0
 .../cases/karlcow/code-4-spaces-escaping.html |  0
 .../cases/karlcow/code-4-spaces-escaping.md   |  0
 .../cases/karlcow/code-4-spaces.html          |  0
 .../cases/karlcow/code-4-spaces.md            |  0
 .../cases/karlcow/em-middle-word.html         |  0
 .../cases/karlcow/em-middle-word.md           |  0
 .../{ => makehtml}/cases/karlcow/em-star.html |  0
 .../{ => makehtml}/cases/karlcow/em-star.md   |  0
 .../cases/karlcow/em-underscore.html          |  0
 .../cases/karlcow/em-underscore.md            |  0
 .../cases/karlcow/entities-text-flow.html     |  0
 .../cases/karlcow/entities-text-flow.md       |  0
 .../header-level1-equal-underlined.html       |  0
 .../karlcow/header-level1-equal-underlined.md |  0
 .../header-level1-hash-sign-closed.html       |  0
 .../karlcow/header-level1-hash-sign-closed.md |  0
 ...der-level1-hash-sign-trailing-1-space.html |  0
 ...eader-level1-hash-sign-trailing-1-space.md |  0
 ...er-level1-hash-sign-trailing-2-spaces.html |  0
 ...ader-level1-hash-sign-trailing-2-spaces.md |  0
 .../karlcow/header-level1-hash-sign.html      |  0
 .../cases/karlcow/header-level1-hash-sign.md  |  0
 .../header-level2-dash-underlined.html        |  0
 .../karlcow/header-level2-dash-underlined.md  |  0
 .../header-level2-hash-sign-closed.html       |  0
 .../karlcow/header-level2-hash-sign-closed.md |  0
 .../karlcow/header-level2-hash-sign.html      |  0
 .../cases/karlcow/header-level2-hash-sign.md  |  0
 .../header-level3-hash-sign-closed.html       |  0
 .../karlcow/header-level3-hash-sign-closed.md |  0
 .../karlcow/header-level3-hash-sign.html      |  0
 .../cases/karlcow/header-level3-hash-sign.md  |  0
 .../header-level4-hash-sign-closed.html       |  0
 .../karlcow/header-level4-hash-sign-closed.md |  0
 .../karlcow/header-level4-hash-sign.html      |  0
 .../cases/karlcow/header-level4-hash-sign.md  |  0
 .../header-level5-hash-sign-closed.html       |  0
 .../karlcow/header-level5-hash-sign-closed.md |  0
 .../karlcow/header-level5-hash-sign.html      |  0
 .../cases/karlcow/header-level5-hash-sign.md  |  0
 .../header-level6-hash-sign-closed.html       |  0
 .../karlcow/header-level6-hash-sign-closed.md |  0
 .../karlcow/header-level6-hash-sign.html      |  0
 .../cases/karlcow/header-level6-hash-sign.md  |  0
 .../horizontal-rule-3-dashes-spaces.html      |  0
 .../horizontal-rule-3-dashes-spaces.md        |  0
 .../karlcow/horizontal-rule-3-dashes.html     |  0
 .../cases/karlcow/horizontal-rule-3-dashes.md |  0
 .../karlcow/horizontal-rule-3-stars.html      |  0
 .../cases/karlcow/horizontal-rule-3-stars.md  |  0
 .../horizontal-rule-3-underscores.html        |  0
 .../karlcow/horizontal-rule-3-underscores.md  |  0
 .../karlcow/horizontal-rule-7-dashes.html     |  0
 .../cases/karlcow/horizontal-rule-7-dashes.md |  0
 .../cases/karlcow/img-idref-title.html        |  0
 .../cases/karlcow/img-idref-title.md          |  0
 .../cases/karlcow/img-idref.html              |  0
 .../{ => makehtml}/cases/karlcow/img-idref.md |  0
 .../cases/karlcow/img-title.html              |  0
 .../{ => makehtml}/cases/karlcow/img-title.md |  0
 .../{ => makehtml}/cases/karlcow/img.html     |  0
 .../{ => makehtml}/cases/karlcow/img.md       |  0
 .../inline-code-escaping-entities.html        |  0
 .../karlcow/inline-code-escaping-entities.md  |  0
 .../inline-code-with-visible-backtick.html    |  0
 .../inline-code-with-visible-backtick.md      |  0
 .../cases/karlcow/inline-code.html            |  0
 .../cases/karlcow/inline-code.md              |  0
 .../cases/karlcow/line-break-2-spaces.html    |  0
 .../cases/karlcow/line-break-2-spaces.md      |  0
 .../cases/karlcow/line-break-5-spaces.html    |  0
 .../cases/karlcow/line-break-5-spaces.md      |  0
 .../cases/karlcow/link-automatic.html         |  0
 .../cases/karlcow/link-automatic.md           |  0
 .../link-bracket-paranthesis-title.html       |  0
 .../karlcow/link-bracket-paranthesis-title.md |  0
 .../karlcow/link-bracket-paranthesis.html     |  0
 .../cases/karlcow/link-bracket-paranthesis.md |  0
 .../karlcow/link-idref-angle-bracket.html     |  0
 .../cases/karlcow/link-idref-angle-bracket.md |  0
 .../karlcow/link-idref-implicit-spaces.html   |  0
 .../karlcow/link-idref-implicit-spaces.md     |  0
 .../cases/karlcow/link-idref-implicit.html    |  0
 .../cases/karlcow/link-idref-implicit.md      |  0
 .../cases/karlcow/link-idref-space.html       |  0
 .../cases/karlcow/link-idref-space.md         |  0
 .../karlcow/link-idref-title-next-line.html   |  0
 .../karlcow/link-idref-title-next-line.md     |  0
 .../karlcow/link-idref-title-paranthesis.html |  0
 .../karlcow/link-idref-title-paranthesis.md   |  0
 .../link-idref-title-single-quote.html        |  0
 .../karlcow/link-idref-title-single-quote.md  |  0
 .../cases/karlcow/link-idref-title.html       |  0
 .../cases/karlcow/link-idref-title.md         |  0
 .../cases/karlcow/link-idref.html             |  0
 .../cases/karlcow/link-idref.md               |  0
 .../cases/karlcow/list-blockquote.html        |  0
 .../cases/karlcow/list-blockquote.md          |  0
 .../cases/karlcow/list-code.html              |  0
 .../{ => makehtml}/cases/karlcow/list-code.md |  0
 .../karlcow/list-multiparagraphs-tab.html     |  0
 .../cases/karlcow/list-multiparagraphs-tab.md |  0
 .../cases/karlcow/list-multiparagraphs.html   |  0
 .../cases/karlcow/list-multiparagraphs.md     |  0
 .../cases/karlcow/ordered-list-escaped.html   |  0
 .../cases/karlcow/ordered-list-escaped.md     |  0
 .../karlcow/ordered-list-inner-par-list.html  |  0
 .../karlcow/ordered-list-inner-par-list.md    |  0
 .../ordered-list-items-random-number.html     |  0
 .../ordered-list-items-random-number.md       |  0
 .../cases/karlcow/ordered-list-items.html     |  0
 .../cases/karlcow/ordered-list-items.md       |  0
 .../cases/karlcow/paragraph-hard-return.html  |  0
 .../cases/karlcow/paragraph-hard-return.md    |  0
 .../cases/karlcow/paragraph-line.html         |  0
 .../cases/karlcow/paragraph-line.md           |  0
 .../paragraph-trailing-leading-spaces.html    |  0
 .../paragraph-trailing-leading-spaces.md      |  0
 .../cases/karlcow/paragraph-trailing-tab.html |  0
 .../cases/karlcow/paragraph-trailing-tab.md   |  0
 .../karlcow/paragraphs-2-leading-spaces.html  |  0
 .../karlcow/paragraphs-2-leading-spaces.md    |  0
 .../karlcow/paragraphs-3-leading-spaces.html  |  0
 .../karlcow/paragraphs-3-leading-spaces.md    |  0
 .../karlcow/paragraphs-leading-space.html     |  0
 .../cases/karlcow/paragraphs-leading-space.md |  0
 .../karlcow/paragraphs-trailing-spaces.html   |  0
 .../karlcow/paragraphs-trailing-spaces.md     |  0
 .../cases/karlcow/strong-middle-word.html     |  0
 .../cases/karlcow/strong-middle-word.md       |  0
 .../cases/karlcow/strong-star.html            |  0
 .../cases/karlcow/strong-star.md              |  0
 .../cases/karlcow/strong-underscore.html      |  0
 .../cases/karlcow/strong-underscore.md        |  0
 .../unordered-list-items-asterisk.html        |  0
 .../karlcow/unordered-list-items-asterisk.md  |  0
 .../unordered-list-items-dashsign.html        |  0
 .../karlcow/unordered-list-items-dashsign.md  |  0
 .../unordered-list-items-leading-1space.html  |  0
 .../unordered-list-items-leading-1space.md    |  0
 .../unordered-list-items-leading-2spaces.html |  0
 .../unordered-list-items-leading-2spaces.md   |  0
 .../unordered-list-items-leading-3spaces.html |  0
 .../unordered-list-items-leading-3spaces.md   |  0
 .../unordered-list-items-plussign.html        |  0
 .../karlcow/unordered-list-items-plussign.md  |  0
 .../karlcow/unordered-list-paragraphs.html    |  0
 .../karlcow/unordered-list-paragraphs.md      |  0
 .../unordered-list-unindented-content.html    |  0
 .../unordered-list-unindented-content.md      |  0
 .../unordered-list-with-indented-content.html |  0
 .../unordered-list-with-indented-content.md   |  0
 .../cases/standard/anchors-by-reference.html  |  0
 .../cases/standard/anchors-by-reference.md    |  0
 .../standard/anchors-followed-by-brakets.html |  0
 .../standard/anchors-followed-by-brakets.md   |  0
 .../cases/standard/automatic-anchors.html     |  0
 .../cases/standard/automatic-anchors.md       |  0
 .../standard/blockquote-followed-by-code.html |  0
 .../standard/blockquote-followed-by-code.md   |  0
 .../standard/blockquote-inside-code.html      |  0
 .../cases/standard/blockquote-inside-code.md  |  0
 .../standard/blockquote-nested-markdown.html  |  0
 .../standard/blockquote-nested-markdown.md    |  0
 .../cases/standard/blockquote.html            |  0
 .../cases/standard/blockquote.md              |  0
 .../standard/code-block-html-escape.html      |  0
 .../cases/standard/code-block-html-escape.md  |  0
 .../code-block-with-special-chars.html        |  0
 .../standard/code-block-with-special-chars.md |  0
 .../cases/standard/code-block.html            |  0
 .../cases/standard/code-block.md              |  0
 .../cases/standard/double-emphasis.html       |  0
 .../cases/standard/double-emphasis.md         |  0
 .../cases/standard/doubline-list.html         |  0
 .../cases/standard/doubline-list.md           |  0
 .../cases/standard/ellipsis.html              |  0
 .../{ => makehtml}/cases/standard/ellipsis.md |  0
 .../standard/emphasis-inside-inline-code.html |  0
 .../standard/emphasis-inside-inline-code.md   |  0
 .../cases/standard/emphasis.html              |  0
 .../{ => makehtml}/cases/standard/emphasis.md |  0
 .../cases/standard/encodeHTMLCodeTags.html    |  0
 .../cases/standard/encodeHTMLCodeTags.md      |  0
 .../cases/standard/escaped-number-period.html |  0
 .../cases/standard/escaped-number-period.md   |  0
 .../cases/standard/escaping.html              |  0
 .../{ => makehtml}/cases/standard/escaping.md |  0
 .../cases/standard/github-style-at-start.html |  0
 .../cases/standard/github-style-at-start.md   |  0
 .../github-style-codeblock-inside-quote.html  |  0
 .../github-style-codeblock-inside-quote.md    |  0
 .../standard/github-style-codeblock.html      |  0
 .../cases/standard/github-style-codeblock.md  |  0
 .../standard/github-style-linebreaks.html     |  0
 .../cases/standard/github-style-linebreaks.md |  0
 .../cases/standard/h1-with-double-hash.html   |  0
 .../cases/standard/h1-with-double-hash.md     |  0
 .../cases/standard/h1-with-equals.html        |  0
 .../cases/standard/h1-with-equals.md          |  0
 .../cases/standard/h1-with-single-hash.html   |  0
 .../cases/standard/h1-with-single-hash.md     |  0
 .../cases/standard/h2-with-dashes.html        |  0
 .../cases/standard/h2-with-dashes.md          |  0
 .../cases/standard/h2-with-double-hash.html   |  0
 .../cases/standard/h2-with-double-hash.md     |  0
 .../cases/standard/h2-with-single-hash.html   |  0
 .../cases/standard/h2-with-single-hash.md     |  0
 .../cases/standard/h3-with-double-hash.html   |  0
 .../cases/standard/h3-with-double-hash.md     |  0
 .../cases/standard/h3-with-single-hash.html   |  0
 .../cases/standard/h3-with-single-hash.md     |  0
 .../cases/standard/h4-with-single-hash.html   |  0
 .../cases/standard/h4-with-single-hash.md     |  0
 .../cases/standard/h5-with-single-hash.html   |  0
 .../cases/standard/h5-with-single-hash.md     |  0
 .../cases/standard/h6-with-single-hash.html   |  0
 .../cases/standard/h6-with-single-hash.md     |  0
 .../cases/standard/horizontal-rules.html      |  0
 .../cases/standard/horizontal-rules.md        |  0
 .../cases/standard/html-comments.html         |  0
 .../cases/standard/html-comments.md           |  0
 .../standard/html-inside-listed-code.html     |  0
 .../cases/standard/html-inside-listed-code.md |  0
 .../cases/standard/html5-strutural-tags.html  |  0
 .../cases/standard/html5-strutural-tags.md    |  1 -
 .../standard/images-followed-by-brackets.html |  0
 .../standard/images-followed-by-brackets.md   |  0
 .../{ => makehtml}/cases/standard/images.html |  0
 .../{ => makehtml}/cases/standard/images.md   |  1 -
 .../cases/standard/implicit-anchors.html      |  0
 .../cases/standard/implicit-anchors.md        |  1 -
 .../cases/standard/inline-anchors.html        |  0
 .../cases/standard/inline-anchors.md          |  1 -
 .../cases/standard/inline-code.html           |  0
 .../cases/standard/inline-code.md             |  1 -
 .../cases/standard/inline-escaped-chars.html  |  0
 .../cases/standard/inline-escaped-chars.md    |  1 -
 .../cases/standard/inline-style-tag.html      |  0
 .../cases/standard/inline-style-tag.md        |  1 -
 .../cases/standard/lazy-blockquote.html       |  0
 .../cases/standard/lazy-blockquote.md         |  1 -
 .../cases/standard/line-starts-with-html.html |  0
 .../cases/standard/line-starts-with-html.md   |  0
 .../standard/list-followed-by-blockquote.html |  0
 .../standard/list-followed-by-blockquote.md   |  0
 .../standard/list-followed-by-ghcode.html     |  0
 .../cases/standard/list-followed-by-ghcode.md |  0
 .../cases/standard/list-with-blockquote.html  |  0
 .../cases/standard/list-with-blockquote.md    |  0
 .../cases/standard/list-with-code.html        |  0
 .../cases/standard/list-with-code.md          |  0
 .../cases/standard/literal-html-tags.html     |  0
 .../cases/standard/literal-html-tags.md       |  0
 .../cases/standard/multi-paragraph-list.html  |  0
 .../cases/standard/multi-paragraph-list.md    |  1 -
 .../standard/multiline-unordered-list.html    |  0
 .../standard/multiline-unordered-list.md      |  1 -
 .../cases/standard/nested-blockquote.html     |  0
 .../cases/standard/nested-blockquote.md       |  1 -
 .../cases/standard/nested-gh-codeblocks.html  |  0
 .../cases/standard/nested-gh-codeblocks.md    |  0
 .../cases/standard/obfuscated-emails.html     |  0
 .../cases/standard/obfuscated-emails.md       |  0
 .../standard/ordered-list-same-number.html    |  0
 .../standard/ordered-list-same-number.md      |  1 -
 .../ordered-list-starting-number.html         |  0
 .../standard/ordered-list-starting-number.md  |  0
 .../standard/ordered-list-wrong-numbers.html  |  0
 .../standard/ordered-list-wrong-numbers.md    |  1 -
 .../cases/standard/ordered-list.html          |  0
 .../cases/standard/ordered-list.md            |  1 -
 .../paragraphed-list-with-sublists.html       |  0
 .../paragraphed-list-with-sublists.md         |  0
 .../pre-code-tags-inside-code-block.html      |  0
 .../pre-code-tags-inside-code-block.md        |  0
 .../cases/standard/pre-code-tags.html         |  0
 .../cases/standard/pre-code-tags.md           |  0
 .../cases/standard/relative-anchors.html      |  0
 .../cases/standard/relative-anchors.md        |  1 -
 .../cases/standard/repeated-headers.html      |  0
 .../cases/standard/repeated-headers.md        |  0
 .../cases/standard/simple-paragraph.html      |  0
 .../cases/standard/simple-paragraph.md        |  1 -
 .../cases/standard/strip-references.html      |  0
 .../cases/standard/strip-references.md        |  0
 .../{ => makehtml}/cases/standard/strong.html |  0
 .../{ => makehtml}/cases/standard/strong.md   |  1 -
 .../standard/unordered-list-asterisk.html     |  0
 .../cases/standard/unordered-list-asterisk.md |  1 -
 .../cases/standard/unordered-list-minus.html  |  0
 .../cases/standard/unordered-list-minus.md    |  1 -
 .../cases/standard/unordered-list-plus.html   |  0
 .../cases/standard/unordered-list-plus.md     |  1 -
 .../cases/standard/url-with-parenthesis.html  |  0
 .../cases/standard/url-with-parenthesis.md    |  0
 .../functional/makehtml/testsuite.features.js | 28 +++---
 test/functional/makehtml/testsuite.ghost.js   |  2 +-
 test/functional/makehtml/testsuite.issues.js  |  2 +-
 test/functional/makehtml/testsuite.karlcow.js |  2 +-
 .../functional/makehtml/testsuite.standard.js |  2 +-
 .../cases/standard/anchors-relative.html      |  1 +
 .../cases/standard/anchors-relative.md        |  1 +
 .../makemarkdown/cases/standard/anchors.html  |  2 +
 .../makemarkdown/cases/standard/anchors.md    |  3 +
 .../standard/blockquote-followed-by-code.html |  9 ++
 .../standard/blockquote-followed-by-code.md   |  9 ++
 .../standard/blockquote-nested-markdown.html  | 10 +++
 .../standard/blockquote-nested-markdown.md    | 10 +++
 .../cases/standard/blockquote.html            |  4 +
 .../makemarkdown/cases/standard/blockquote.md |  3 +
 .../cases/standard/emphasis-double.html       |  2 +
 .../cases/standard/emphasis-double.md         |  3 +
 .../standard/emphasis-inside-inline-code.html |  1 +
 .../standard/emphasis-inside-inline-code.md   |  1 +
 .../makemarkdown/cases/standard/emphasis.html | 37 ++++++++
 .../makemarkdown/cases/standard/emphasis.md   | 71 ++++++++++++++++
 .../standard/escaping-html-entities.html      |  4 +
 .../cases/standard/escaping-html-entities.md  |  7 ++
 .../makemarkdown/cases/standard/escaping.html | 17 ++++
 .../makemarkdown/cases/standard/escaping.md   | 33 +++++++
 .../cases/standard/github-style-at-start.html |  5 ++
 .../cases/standard/github-style-at-start.md   |  7 ++
 .../github-style-codeblock-inside-quote.html  | 13 +++
 .../github-style-codeblock-inside-quote.md    | 13 +++
 .../standard/github-style-codeblock.html      | 13 +++
 .../cases/standard/github-style-codeblock.md  | 20 +++++
 .../standard/github-style-linebreaks.html     |  3 +
 .../cases/standard/github-style-linebreaks.md |  4 +
 .../cases/standard/h1-with-single-hash.html   |  1 +
 .../cases/standard/h1-with-single-hash.md     |  1 +
 .../cases/standard/h2-with-single-hash.html   |  1 +
 .../cases/standard/h2-with-single-hash.md     |  1 +
 .../cases/standard/h3-with-single-hash.html   |  1 +
 .../cases/standard/h3-with-single-hash.md     |  1 +
 .../cases/standard/h4-with-single-hash.html   |  1 +
 .../cases/standard/h4-with-single-hash.md     |  1 +
 .../cases/standard/h5-with-single-hash.html   |  1 +
 .../cases/standard/h5-with-single-hash.md     |  1 +
 .../cases/standard/h6-with-single-hash.html   |  1 +
 .../cases/standard/h6-with-single-hash.md     |  1 +
 .../cases/standard/html-comments.html         |  9 ++
 .../cases/standard/html-comments.md           | 17 ++++
 .../makemarkdown/cases/standard/html.html     | 10 +++
 .../makemarkdown/cases/standard/html.md       |  6 ++
 .../cases/standard/html5-strutural-tags.html  | 34 ++++++++
 .../cases/standard/html5-strutural-tags.md    | 33 +++++++
 .../makemarkdown/cases/standard/images.html   |  6 ++
 .../makemarkdown/cases/standard/images.md     | 11 +++
 .../cases/standard/nested-gh-codeblocks.html  |  8 ++
 .../cases/standard/nested-gh-codeblocks.md    |  9 ++
 .../ordered-list-starting-number.html         |  5 ++
 .../standard/ordered-list-starting-number.md  |  4 +
 .../cases/standard/ordered-list.html          |  5 ++
 .../cases/standard/ordered-list.md            |  3 +
 .../cases/standard/paragraph-simple.html      |  1 +
 .../cases/standard/paragraph-simple.md        |  1 +
 .../paragraphed-list-with-sublists.html       | 11 +++
 .../paragraphed-list-with-sublists.md         | 13 +++
 .../makemarkdown/makemarkdown.bootstrap.js    | 85 +++++++++++++++++++
 .../makemarkdown/testsuite.standard.js        | 15 ++++
 696 files changed, 685 insertions(+), 57 deletions(-)
 rename test/functional/{ => makehtml}/cases/features/#143.support-image-dimensions.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#143.support-image-dimensions.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.1.simple-autolink.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.1.simple-autolink.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.2.disallow-underscore-emphasis-mid-word.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.2.disallow-underscore-emphasis-mid-word.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.3.strikethrough.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.3.strikethrough.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.4.tasklists.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#164.4.tasklists.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#178.markdown-inside-html-does-not-parse.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#178.markdown-inside-html-does-not-parse.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#204.certain-links-with-at-and-dot-break-url.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#204.certain-links-with-at-and-dot-break-url.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#206.treat-single-line-breaks-as-br.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#206.treat-single-line-breaks-as-br.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#214.escaped-markdown-chars-break-strikethrough.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#214.escaped-markdown-chars-break-strikethrough.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#259.es6-template-strings-indentation-issues.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#259.es6-template-strings-indentation-issues.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#320.github-compatible-generated-header-id.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#320.github-compatible-generated-header-id.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#323.simpleLineBreaks-breaks-with-strong.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#323.simpleLineBreaks-breaks-with-strong.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#331.allow-escaping-of-tilde.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#331.allow-escaping-of-tilde.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#374.escape-html-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#374.escape-html-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.md (100%)
 rename test/functional/{ => makehtml}/cases/features/#69.header-level-start.html (100%)
 rename test/functional/{ => makehtml}/cases/features/#69.header-level-start.md (100%)
 rename test/functional/{ => makehtml}/cases/features/completeHTMLOutput/simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/completeHTMLOutput/simple.md (100%)
 rename test/functional/{ => makehtml}/cases/features/customizedHeaderId-simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/customizedHeaderId-simple.md (100%)
 rename test/functional/{ => makehtml}/cases/features/disable-email-encoding.html (100%)
 rename test/functional/{ => makehtml}/cases/features/disable-email-encoding.md (100%)
 rename test/functional/{ => makehtml}/cases/features/disable-gh-codeblocks.html (100%)
 rename test/functional/{ => makehtml}/cases/features/disable-gh-codeblocks.md (100%)
 rename test/functional/{ => makehtml}/cases/features/disableForced4SpacesIndentedSublists.html (100%)
 rename test/functional/{ => makehtml}/cases/features/disableForced4SpacesIndentedSublists.md (100%)
 rename test/functional/{ => makehtml}/cases/features/disableForced4SpacesIndentedSublists/.gitkeep (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/complex.html (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/complex.md (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/links.html (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/links.md (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/simple.md (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/simplifiedautolinks.html (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/simplifiedautolinks.md (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/special.html (100%)
 rename test/functional/{ => makehtml}/cases/features/emojis/special.md (100%)
 rename test/functional/{ => makehtml}/cases/features/excludeTrailingPunctuationFromURLs-option.html (100%)
 rename test/functional/{ => makehtml}/cases/features/excludeTrailingPunctuationFromURLs-option.md (100%)
 rename test/functional/{ => makehtml}/cases/features/ghMentions.html (100%)
 rename test/functional/{ => makehtml}/cases/features/ghMentions.md (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordAsterisks/basic.html (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordAsterisks/basic.md (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordAsterisks/punctation-test.html (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordAsterisks/punctation-test.md (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordUnderscores/basic.html (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordUnderscores/basic.md (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordUnderscores/punctation-test.html (100%)
 rename test/functional/{ => makehtml}/cases/features/literalMidWordUnderscores/punctation-test.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/dashes-conflict.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/dashes-conflict.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/embeded-in-output.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/embeded-in-output.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/embeded-two-consecutive-metadata-blocks.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/embeded-two-consecutive-metadata-blocks.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/ignore-metadata.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/ignore-metadata.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-angled-for-method.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-angled-for-method.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-angled-quotes.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-angled-quotes.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-three-dashes.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-three-dashes.md (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-with-format.html (100%)
 rename test/functional/{ => makehtml}/cases/features/metadata/simple-with-format.md (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.html (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.md (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/simple-cases.html (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/simple-cases.md (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/simple.md (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/simplifiedAutoLink.html (100%)
 rename test/functional/{ => makehtml}/cases/features/openLinksInNewWindow/simplifiedAutoLink.md (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-simple.md (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.html (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.md (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.html (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.md (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-string.html (100%)
 rename test/functional/{ => makehtml}/cases/features/prefixHeaderId-string.md (100%)
 rename test/functional/{ => makehtml}/cases/features/rawHeaderId/simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/rawHeaderId/simple.md (100%)
 rename test/functional/{ => makehtml}/cases/features/rawHeaderId/with-prefixHeaderId.html (100%)
 rename test/functional/{ => makehtml}/cases/features/rawHeaderId/with-prefixHeaderId.md (100%)
 rename test/functional/{ => makehtml}/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.html (100%)
 rename test/functional/{ => makehtml}/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.md (100%)
 rename test/functional/{ => makehtml}/cases/features/requireSpaceBeforeHeadingText.html (100%)
 rename test/functional/{ => makehtml}/cases/features/requireSpaceBeforeHeadingText.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simpleLineBreaks-handle-html-pre.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simpleLineBreaks-handle-html-pre.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simpleLineBreaks2.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simpleLineBreaks2.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/blockquote.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/disallow-underscores.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/disallow-underscores.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/does-not-parse-inside-code.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/does-not-parse-inside-code.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/does-not-parse-reference-links.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/does-not-parse-reference-links.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/ordered-lists.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/ordered-lists.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/text.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/text.md (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/unordered-lists.html (100%)
 rename test/functional/{ => makehtml}/cases/features/simplifiedAutoLink/unordered-lists.md (100%)
 rename test/functional/{ => makehtml}/cases/features/splitAdjacentBlockquotes/basic.html (100%)
 rename test/functional/{ => makehtml}/cases/features/splitAdjacentBlockquotes/basic.md (100%)
 rename test/functional/{ => makehtml}/cases/features/splitAdjacentBlockquotes/multiline-paragraph.html (100%)
 rename test/functional/{ => makehtml}/cases/features/splitAdjacentBlockquotes/multiline-paragraph.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#179.parse-md-in-table-ths.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#179.parse-md-in-table-ths.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#345.escape-pipe-character.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#345.escape-pipe-character.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#406.does-not-render-one-column-tables.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#406.does-not-render-one-column-tables.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#442.trailing-spaces-break-one-column-tables.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#442.trailing-spaces-break-one-column-tables.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#465.code-spans-with-pipes-break-table.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#465.code-spans-with-pipes-break-table.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/basic-alignment.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/basic-alignment.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/basic-with-header-ids.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/basic-with-header-ids.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/basic.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/basic.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/gh-style-tables.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/gh-style-tables.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/large-table-with-allignments.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/large-table-with-allignments.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/large.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/large.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/mixed-alignment.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/mixed-alignment.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/multiple-tables.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/multiple-tables.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/table-inside-codeblock.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/table-inside-codeblock.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/table-without-leading-pipe.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/table-without-leading-pipe.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/with-equals.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/with-equals.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/with-span-elements.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/with-span-elements.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/with-surroundings.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/with-surroundings.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/without-body.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/without-body.md (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/without-header-delimiter.html (100%)
 rename test/functional/{ => makehtml}/cases/features/tables/without-header-delimiter.md (100%)
 rename test/functional/{ => makehtml}/cases/features/underline/fulltext.html (100%)
 rename test/functional/{ => makehtml}/cases/features/underline/fulltext.md (100%)
 rename test/functional/{ => makehtml}/cases/features/underline/simple.html (100%)
 rename test/functional/{ => makehtml}/cases/features/underline/simple.md (100%)
 rename test/functional/{ => makehtml}/cases/ghost/markdown-magic.html (100%)
 rename test/functional/{ => makehtml}/cases/ghost/markdown-magic.md (100%)
 rename test/functional/{ => makehtml}/cases/ghost/underscore.html (100%)
 rename test/functional/{ => makehtml}/cases/ghost/underscore.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#107.inner-underscore-parse-to-block.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#107.inner-underscore-parse-to-block.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#150.hyphens-are-getting-removed.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#150.hyphens-are-getting-removed.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#191.blockquote-followed-by-an-heading.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#191.blockquote-followed-by-an-heading.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#196.entity-in-code-block-in-nested-list.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#196.entity-in-code-block-in-nested-list.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#220.html-breaks-markdown-parsing.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#220.html-breaks-markdown-parsing.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#230.paragraphs-are-ignored-between-code-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#230.paragraphs-are-ignored-between-code-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#261.mix-images-with-links.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#261.mix-images-with-links.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char2.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char2.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char3.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char3.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char4.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#312.spaced-dashes-followed-by-char4.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#317.spaces-before-hr.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#317.spaces-before-hr.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#345.no-escape-for-the-pipe-character.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#345.no-escape-for-the-pipe-character.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#390.brackets-in-URL-break-images.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#390.brackets-in-URL-break-images.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#390.brackets-in-URL-break-links.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#390.brackets-in-URL-break-links.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#393.showdown-hangs-with-malformed-html.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#393.showdown-hangs-with-malformed-html.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#397.unordered-list-strange-behavior.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#397.unordered-list-strange-behavior.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#429.multiline-base64-image-support.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#429.multiline-base64-image-support.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#467.header-ids-for-subheadings.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#467.header-ids-for-subheadings.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#83.parsed-text-links-with-underscores.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#83.parsed-text-links-with-underscores.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/#96.underscores-in-links.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/#96.underscores-in-links.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/URLs-with-multiple-parenthesis.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/URLs-with-multiple-parenthesis.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/crazy-urls.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/crazy-urls.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/deeply-nested-HTML-blocks.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/deeply-nested-HTML-blocks.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/handle-html-pre.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/handle-html-pre.md (100%)
 rename test/functional/{ => makehtml}/cases/issues/one-line-HTML-input.html (100%)
 rename test/functional/{ => makehtml}/cases/issues/one-line-HTML-input.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-hard-return-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-hard-return-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-hard-return.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-hard-return.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line-returns.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line-returns.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line-tab.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line-tab.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/2-paragraphs-line.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/EOL-CR+LF.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/EOL-CR+LF.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/EOL-CR.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/EOL-CR.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/EOL-LF.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/EOL-LF.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ampersand-text-flow.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ampersand-text-flow.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ampersand-uri.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ampersand-uri.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/asterisk-near-text.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/asterisk-near-text.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/asterisk.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/asterisk.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/backslash-escape.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/backslash-escape.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-added-markup.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-added-markup.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-line-2-paragraphs.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-line-2-paragraphs.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-line.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-line.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline-1-space-begin.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline-1-space-begin.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline-1-space-end.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline-1-space-end.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline-2-paragraphs.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline-2-paragraphs.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-multiline.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested-multiplereturn-level1.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested-multiplereturn-level1.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested-multiplereturn.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested-multiplereturn.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested-return-level1.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested-return-level1.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/blockquote-nested.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/code-1-tab.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/code-1-tab.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/code-4-spaces-escaping.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/code-4-spaces-escaping.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/code-4-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/code-4-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/em-middle-word.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/em-middle-word.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/em-star.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/em-star.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/em-underscore.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/em-underscore.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/entities-text-flow.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/entities-text-flow.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-equal-underlined.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-equal-underlined.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign-closed.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign-closed.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign-trailing-1-space.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign-trailing-1-space.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level1-hash-sign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level2-dash-underlined.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level2-dash-underlined.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level2-hash-sign-closed.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level2-hash-sign-closed.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level2-hash-sign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level2-hash-sign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level3-hash-sign-closed.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level3-hash-sign-closed.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level3-hash-sign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level3-hash-sign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level4-hash-sign-closed.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level4-hash-sign-closed.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level4-hash-sign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level4-hash-sign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level5-hash-sign-closed.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level5-hash-sign-closed.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level5-hash-sign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level5-hash-sign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level6-hash-sign-closed.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level6-hash-sign-closed.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level6-hash-sign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/header-level6-hash-sign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-dashes-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-dashes-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-dashes.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-dashes.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-stars.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-stars.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-underscores.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-3-underscores.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-7-dashes.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/horizontal-rule-7-dashes.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img-idref-title.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img-idref-title.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img-idref.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img-idref.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img-title.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img-title.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/img.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/inline-code-escaping-entities.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/inline-code-escaping-entities.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/inline-code-with-visible-backtick.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/inline-code-with-visible-backtick.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/inline-code.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/inline-code.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/line-break-2-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/line-break-2-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/line-break-5-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/line-break-5-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-automatic.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-automatic.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-bracket-paranthesis-title.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-bracket-paranthesis-title.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-bracket-paranthesis.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-bracket-paranthesis.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-angle-bracket.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-angle-bracket.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-implicit-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-implicit-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-implicit.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-implicit.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-space.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-space.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title-next-line.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title-next-line.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title-paranthesis.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title-paranthesis.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title-single-quote.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title-single-quote.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref-title.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/link-idref.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-blockquote.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-code.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-code.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-multiparagraphs-tab.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-multiparagraphs-tab.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-multiparagraphs.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/list-multiparagraphs.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-escaped.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-escaped.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-inner-par-list.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-inner-par-list.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-items-random-number.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-items-random-number.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-items.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/ordered-list-items.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-hard-return.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-hard-return.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-line.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-line.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-trailing-leading-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-trailing-leading-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-trailing-tab.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraph-trailing-tab.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-2-leading-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-2-leading-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-3-leading-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-3-leading-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-leading-space.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-leading-space.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-trailing-spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/paragraphs-trailing-spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/strong-middle-word.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/strong-middle-word.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/strong-star.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/strong-star.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/strong-underscore.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/strong-underscore.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-asterisk.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-asterisk.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-dashsign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-dashsign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-leading-1space.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-leading-1space.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-leading-2spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-leading-2spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-leading-3spaces.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-leading-3spaces.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-plussign.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-items-plussign.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-paragraphs.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-paragraphs.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-unindented-content.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-unindented-content.md (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-with-indented-content.html (100%)
 rename test/functional/{ => makehtml}/cases/karlcow/unordered-list-with-indented-content.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/anchors-by-reference.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/anchors-by-reference.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/anchors-followed-by-brakets.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/anchors-followed-by-brakets.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/automatic-anchors.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/automatic-anchors.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote-followed-by-code.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote-followed-by-code.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote-inside-code.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote-inside-code.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote-nested-markdown.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote-nested-markdown.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/blockquote.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/code-block-html-escape.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/code-block-html-escape.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/code-block-with-special-chars.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/code-block-with-special-chars.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/code-block.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/code-block.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/double-emphasis.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/double-emphasis.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/doubline-list.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/doubline-list.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/ellipsis.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/ellipsis.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/emphasis-inside-inline-code.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/emphasis-inside-inline-code.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/emphasis.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/emphasis.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/encodeHTMLCodeTags.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/encodeHTMLCodeTags.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/escaped-number-period.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/escaped-number-period.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/escaping.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/escaping.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-at-start.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-at-start.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-codeblock-inside-quote.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-codeblock-inside-quote.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-codeblock.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-codeblock.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-linebreaks.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/github-style-linebreaks.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h1-with-double-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h1-with-double-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h1-with-equals.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h1-with-equals.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h1-with-single-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h1-with-single-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h2-with-dashes.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h2-with-dashes.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h2-with-double-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h2-with-double-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h2-with-single-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h2-with-single-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h3-with-double-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h3-with-double-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h3-with-single-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h3-with-single-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h4-with-single-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h4-with-single-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h5-with-single-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h5-with-single-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/h6-with-single-hash.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/h6-with-single-hash.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/horizontal-rules.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/horizontal-rules.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/html-comments.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/html-comments.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/html-inside-listed-code.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/html-inside-listed-code.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/html5-strutural-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/html5-strutural-tags.md (99%)
 rename test/functional/{ => makehtml}/cases/standard/images-followed-by-brackets.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/images-followed-by-brackets.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/images.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/images.md (99%)
 rename test/functional/{ => makehtml}/cases/standard/implicit-anchors.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/implicit-anchors.md (99%)
 rename test/functional/{ => makehtml}/cases/standard/inline-anchors.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/inline-anchors.md (99%)
 rename test/functional/{ => makehtml}/cases/standard/inline-code.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/inline-code.md (99%)
 rename test/functional/{ => makehtml}/cases/standard/inline-escaped-chars.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/inline-escaped-chars.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/inline-style-tag.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/inline-style-tag.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/lazy-blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/lazy-blockquote.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/line-starts-with-html.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/line-starts-with-html.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-followed-by-blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-followed-by-blockquote.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-followed-by-ghcode.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-followed-by-ghcode.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-with-blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-with-blockquote.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-with-code.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/list-with-code.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/literal-html-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/literal-html-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/multi-paragraph-list.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/multi-paragraph-list.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/multiline-unordered-list.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/multiline-unordered-list.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/nested-blockquote.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/nested-blockquote.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/nested-gh-codeblocks.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/nested-gh-codeblocks.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/obfuscated-emails.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/obfuscated-emails.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list-same-number.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list-same-number.md (96%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list-starting-number.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list-starting-number.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list-wrong-numbers.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list-wrong-numbers.md (96%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/ordered-list.md (96%)
 rename test/functional/{ => makehtml}/cases/standard/paragraphed-list-with-sublists.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/paragraphed-list-with-sublists.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/pre-code-tags-inside-code-block.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/pre-code-tags-inside-code-block.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/pre-code-tags.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/pre-code-tags.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/relative-anchors.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/relative-anchors.md (97%)
 rename test/functional/{ => makehtml}/cases/standard/repeated-headers.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/repeated-headers.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/simple-paragraph.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/simple-paragraph.md (93%)
 rename test/functional/{ => makehtml}/cases/standard/strip-references.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/strip-references.md (100%)
 rename test/functional/{ => makehtml}/cases/standard/strong.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/strong.md (98%)
 rename test/functional/{ => makehtml}/cases/standard/unordered-list-asterisk.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/unordered-list-asterisk.md (96%)
 rename test/functional/{ => makehtml}/cases/standard/unordered-list-minus.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/unordered-list-minus.md (96%)
 rename test/functional/{ => makehtml}/cases/standard/unordered-list-plus.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/unordered-list-plus.md (96%)
 rename test/functional/{ => makehtml}/cases/standard/url-with-parenthesis.html (100%)
 rename test/functional/{ => makehtml}/cases/standard/url-with-parenthesis.md (100%)
 create mode 100644 test/functional/makemarkdown/cases/standard/anchors-relative.html
 create mode 100644 test/functional/makemarkdown/cases/standard/anchors-relative.md
 create mode 100644 test/functional/makemarkdown/cases/standard/anchors.html
 create mode 100644 test/functional/makemarkdown/cases/standard/anchors.md
 create mode 100644 test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.html
 create mode 100644 test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.md
 create mode 100644 test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.html
 create mode 100644 test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.md
 create mode 100644 test/functional/makemarkdown/cases/standard/blockquote.html
 create mode 100644 test/functional/makemarkdown/cases/standard/blockquote.md
 create mode 100644 test/functional/makemarkdown/cases/standard/emphasis-double.html
 create mode 100644 test/functional/makemarkdown/cases/standard/emphasis-double.md
 create mode 100644 test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.html
 create mode 100644 test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.md
 create mode 100644 test/functional/makemarkdown/cases/standard/emphasis.html
 create mode 100644 test/functional/makemarkdown/cases/standard/emphasis.md
 create mode 100644 test/functional/makemarkdown/cases/standard/escaping-html-entities.html
 create mode 100644 test/functional/makemarkdown/cases/standard/escaping-html-entities.md
 create mode 100644 test/functional/makemarkdown/cases/standard/escaping.html
 create mode 100644 test/functional/makemarkdown/cases/standard/escaping.md
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-at-start.html
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-at-start.md
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.html
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.md
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-codeblock.html
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-codeblock.md
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-linebreaks.html
 create mode 100644 test/functional/makemarkdown/cases/standard/github-style-linebreaks.md
 create mode 100644 test/functional/makemarkdown/cases/standard/h1-with-single-hash.html
 create mode 100644 test/functional/makemarkdown/cases/standard/h1-with-single-hash.md
 create mode 100644 test/functional/makemarkdown/cases/standard/h2-with-single-hash.html
 create mode 100644 test/functional/makemarkdown/cases/standard/h2-with-single-hash.md
 create mode 100644 test/functional/makemarkdown/cases/standard/h3-with-single-hash.html
 create mode 100644 test/functional/makemarkdown/cases/standard/h3-with-single-hash.md
 create mode 100644 test/functional/makemarkdown/cases/standard/h4-with-single-hash.html
 create mode 100644 test/functional/makemarkdown/cases/standard/h4-with-single-hash.md
 create mode 100644 test/functional/makemarkdown/cases/standard/h5-with-single-hash.html
 create mode 100644 test/functional/makemarkdown/cases/standard/h5-with-single-hash.md
 create mode 100644 test/functional/makemarkdown/cases/standard/h6-with-single-hash.html
 create mode 100644 test/functional/makemarkdown/cases/standard/h6-with-single-hash.md
 create mode 100644 test/functional/makemarkdown/cases/standard/html-comments.html
 create mode 100644 test/functional/makemarkdown/cases/standard/html-comments.md
 create mode 100644 test/functional/makemarkdown/cases/standard/html.html
 create mode 100644 test/functional/makemarkdown/cases/standard/html.md
 create mode 100644 test/functional/makemarkdown/cases/standard/html5-strutural-tags.html
 create mode 100644 test/functional/makemarkdown/cases/standard/html5-strutural-tags.md
 create mode 100644 test/functional/makemarkdown/cases/standard/images.html
 create mode 100644 test/functional/makemarkdown/cases/standard/images.md
 create mode 100644 test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.html
 create mode 100644 test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.md
 create mode 100644 test/functional/makemarkdown/cases/standard/ordered-list-starting-number.html
 create mode 100644 test/functional/makemarkdown/cases/standard/ordered-list-starting-number.md
 create mode 100644 test/functional/makemarkdown/cases/standard/ordered-list.html
 create mode 100644 test/functional/makemarkdown/cases/standard/ordered-list.md
 create mode 100644 test/functional/makemarkdown/cases/standard/paragraph-simple.html
 create mode 100644 test/functional/makemarkdown/cases/standard/paragraph-simple.md
 create mode 100644 test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.html
 create mode 100644 test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.md
 create mode 100644 test/functional/makemarkdown/makemarkdown.bootstrap.js
 create mode 100644 test/functional/makemarkdown/testsuite.standard.js

diff --git a/src/converter.js b/src/converter.js
index 2902f37..4e0c9f4 100644
--- a/src/converter.js
+++ b/src/converter.js
@@ -367,12 +367,23 @@ showdown.Converter = function (converterOptions) {
     // remove all newlines and collapse spaces
     clean(doc);
 
+    // some stuff, like accidental reference links must now be escaped
+    doc.innerHTML = doc.innerHTML.replace(/\[[\S\t ]]/);
+
+
+    var nodes = doc.childNodes,
+      mdDoc = '';
+
+    for (var i = 0; i < nodes.length; i++) {
+      mdDoc += parseNode(nodes[i]);
+    }
+
+
     function parseNode (node, spansOnly) {
 
       spansOnly = spansOnly || false;
 
       var txt = '';
-      //indent = new Array((indentationLevel * 4) + 1).join(' ');
 
       // edge case of text without wrapper paragraph
       if (node.nodeType === 3) {
@@ -381,8 +392,7 @@ showdown.Converter = function (converterOptions) {
 
       // HTML comment
       if (node.nodeType === 8) {
-        // TODO parse comments
-        return '';
+        return '<!--' + node.data + '-->\n\n';
       }
 
       // process only node elements
@@ -478,7 +488,7 @@ showdown.Converter = function (converterOptions) {
           break;
 
         default:
-          txt = node.innerHTML;
+          txt = node.outerHTML + '\n\n';
       }
 
       return txt;
@@ -487,11 +497,17 @@ showdown.Converter = function (converterOptions) {
     function parseTxt (node) {
       var txt = node.nodeValue;
 
+      // multiple spaces are collapsed
+      txt = txt.replace(/ +/g, ' ');
+
       txt = txt.replace(/¨NBSP;/g, ' ');
 
+      // ", <, > and & should replace escaped html entities
+      txt = showdown.helper.unescapeHTMLEntities(txt);
+
       // escape markdown magic characters
       // emphasis, strong and strikethrough - can appear everywhere
-      // we also escape pipe (\) because of tables
+      // we also escape pipe (|) because of tables
       // and escape ` because of code blocks and spans
       txt = txt.replace(/([*_~|`])/g, '\\$1');
 
@@ -507,14 +523,16 @@ showdown.Converter = function (converterOptions) {
       // dot, because of ordered lists, only troublesome at the beginning of a line when preceded by an integer
       txt = txt.replace(/^( {0,3}\d+)\./gm, '$1\\.');
 
-      // + and -, at the beginning of a line becomes a list, so we need to escape them also
+      // +, * and -, at the beginning of a line becomes a list, so we need to escape them also (asterisk was already escaped)
       txt = txt.replace(/^( {0,3})([+-])/gm, '$1\\$2');
 
       // images and links, ] followed by ( is problematic, so we escape it
-      // same for reference style uris
-      // might be a bit overzealous, but we prefer to be safe
       txt = txt.replace(/]([\s]*)\(/g, '\\]$1\\(');
-      txt = txt.replace(/\[([\s\S]*)]:/g, '\\[$1\\]:');
+
+      // reference URIs must also be escaped
+      txt = txt.replace(/^ {0,3}\[([\S \t]*?)]:/gm, '\\[$1]:');
+
+
 
       return txt;
     }
@@ -526,7 +544,7 @@ showdown.Converter = function (converterOptions) {
       }
       var listItems       = node.childNodes,
           listItemsLenght = listItems.length,
-          listNum = 1;
+          listNum = node.getAttribute('start') || 1;
 
       for (var i = 0; i < listItemsLenght; ++i) {
         if (typeof listItems[i].tagName === 'undefined' || listItems[i].tagName.toLowerCase() !== 'li') {
@@ -654,7 +672,11 @@ showdown.Converter = function (converterOptions) {
           txt += parseNode(children[i]);
         }
         txt += ']';
-        txt += '(' + node.getAttribute('href') + ')';
+        txt += '(' + node.getAttribute('href');
+        if (node.hasAttribute('title')) {
+          txt += ' "' + node.getAttribute('title') + '"';
+        }
+        txt += ')';
       }
       return txt;
     }
@@ -827,8 +849,24 @@ showdown.Converter = function (converterOptions) {
       for (var i = 0; i < pres.length; ++i) {
 
         if (pres[i].childElementCount === 1 && pres[i].firstChild.tagName.toLowerCase() === 'code') {
-          var content = pres[i].firstChild.innerHTML,
+          var content = pres[i].firstChild.innerHTML.trim(),
               language = pres[i].firstChild.getAttribute('data-language') || '';
+
+          // if data-language attribute is not defined, then we look for class language-*
+          if (language === '') {
+            var classes = pres[i].firstChild.className.split(" ");
+            for (var c = 0; c < classes.length; ++c) {
+              var matches = classes[c].match(/^language-(.+)$/);
+              if (matches !== null) {
+                language = matches[1];
+                break;
+              }
+            }
+          }
+
+          // unescape html entities in content
+          content = showdown.helper.unescapeHTMLEntities(content);
+
           presPH.push(content);
           pres[i].outerHTML = '<precode language="' + language + '" precodenum="' + i.toString() + '"></precode>';
         } else {
@@ -840,13 +878,6 @@ showdown.Converter = function (converterOptions) {
       return presPH;
     }
 
-    var nodes = doc.childNodes,
-        mdDoc = '';
-
-    for (var i = 0; i < nodes.length; i++) {
-      mdDoc += parseNode(nodes[i]);
-    }
-
     return mdDoc;
   };
 
diff --git a/src/helpers.js b/src/helpers.js
index be68693..6d71f4c 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -375,6 +375,19 @@ showdown.helper.padEnd = function padEnd (str, targetLength, padString) {
   }
 };
 
+/**
+ * Unescape HTML entities
+ * @param txt
+ * @returns {string}
+ */
+showdown.helper.unescapeHTMLEntities = function (txt) {
+  return txt
+    .replace(/&quot;/g, '"')
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&amp;/g, '&');
+};
+
 /**
  * POLYFILLS
  */
diff --git a/test/functional/cases/features/#143.support-image-dimensions.html b/test/functional/makehtml/cases/features/#143.support-image-dimensions.html
similarity index 100%
rename from test/functional/cases/features/#143.support-image-dimensions.html
rename to test/functional/makehtml/cases/features/#143.support-image-dimensions.html
diff --git a/test/functional/cases/features/#143.support-image-dimensions.md b/test/functional/makehtml/cases/features/#143.support-image-dimensions.md
similarity index 100%
rename from test/functional/cases/features/#143.support-image-dimensions.md
rename to test/functional/makehtml/cases/features/#143.support-image-dimensions.md
diff --git a/test/functional/cases/features/#164.1.simple-autolink.html b/test/functional/makehtml/cases/features/#164.1.simple-autolink.html
similarity index 100%
rename from test/functional/cases/features/#164.1.simple-autolink.html
rename to test/functional/makehtml/cases/features/#164.1.simple-autolink.html
diff --git a/test/functional/cases/features/#164.1.simple-autolink.md b/test/functional/makehtml/cases/features/#164.1.simple-autolink.md
similarity index 100%
rename from test/functional/cases/features/#164.1.simple-autolink.md
rename to test/functional/makehtml/cases/features/#164.1.simple-autolink.md
diff --git a/test/functional/cases/features/#164.2.disallow-underscore-emphasis-mid-word.html b/test/functional/makehtml/cases/features/#164.2.disallow-underscore-emphasis-mid-word.html
similarity index 100%
rename from test/functional/cases/features/#164.2.disallow-underscore-emphasis-mid-word.html
rename to test/functional/makehtml/cases/features/#164.2.disallow-underscore-emphasis-mid-word.html
diff --git a/test/functional/cases/features/#164.2.disallow-underscore-emphasis-mid-word.md b/test/functional/makehtml/cases/features/#164.2.disallow-underscore-emphasis-mid-word.md
similarity index 100%
rename from test/functional/cases/features/#164.2.disallow-underscore-emphasis-mid-word.md
rename to test/functional/makehtml/cases/features/#164.2.disallow-underscore-emphasis-mid-word.md
diff --git a/test/functional/cases/features/#164.3.strikethrough.html b/test/functional/makehtml/cases/features/#164.3.strikethrough.html
similarity index 100%
rename from test/functional/cases/features/#164.3.strikethrough.html
rename to test/functional/makehtml/cases/features/#164.3.strikethrough.html
diff --git a/test/functional/cases/features/#164.3.strikethrough.md b/test/functional/makehtml/cases/features/#164.3.strikethrough.md
similarity index 100%
rename from test/functional/cases/features/#164.3.strikethrough.md
rename to test/functional/makehtml/cases/features/#164.3.strikethrough.md
diff --git a/test/functional/cases/features/#164.4.tasklists.html b/test/functional/makehtml/cases/features/#164.4.tasklists.html
similarity index 100%
rename from test/functional/cases/features/#164.4.tasklists.html
rename to test/functional/makehtml/cases/features/#164.4.tasklists.html
diff --git a/test/functional/cases/features/#164.4.tasklists.md b/test/functional/makehtml/cases/features/#164.4.tasklists.md
similarity index 100%
rename from test/functional/cases/features/#164.4.tasklists.md
rename to test/functional/makehtml/cases/features/#164.4.tasklists.md
diff --git a/test/functional/cases/features/#178.markdown-inside-html-does-not-parse.html b/test/functional/makehtml/cases/features/#178.markdown-inside-html-does-not-parse.html
similarity index 100%
rename from test/functional/cases/features/#178.markdown-inside-html-does-not-parse.html
rename to test/functional/makehtml/cases/features/#178.markdown-inside-html-does-not-parse.html
diff --git a/test/functional/cases/features/#178.markdown-inside-html-does-not-parse.md b/test/functional/makehtml/cases/features/#178.markdown-inside-html-does-not-parse.md
similarity index 100%
rename from test/functional/cases/features/#178.markdown-inside-html-does-not-parse.md
rename to test/functional/makehtml/cases/features/#178.markdown-inside-html-does-not-parse.md
diff --git a/test/functional/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html b/test/functional/makehtml/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html
similarity index 100%
rename from test/functional/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html
rename to test/functional/makehtml/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html
diff --git a/test/functional/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md b/test/functional/makehtml/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md
similarity index 100%
rename from test/functional/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md
rename to test/functional/makehtml/cases/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md
diff --git a/test/functional/cases/features/#204.certain-links-with-at-and-dot-break-url.html b/test/functional/makehtml/cases/features/#204.certain-links-with-at-and-dot-break-url.html
similarity index 100%
rename from test/functional/cases/features/#204.certain-links-with-at-and-dot-break-url.html
rename to test/functional/makehtml/cases/features/#204.certain-links-with-at-and-dot-break-url.html
diff --git a/test/functional/cases/features/#204.certain-links-with-at-and-dot-break-url.md b/test/functional/makehtml/cases/features/#204.certain-links-with-at-and-dot-break-url.md
similarity index 100%
rename from test/functional/cases/features/#204.certain-links-with-at-and-dot-break-url.md
rename to test/functional/makehtml/cases/features/#204.certain-links-with-at-and-dot-break-url.md
diff --git a/test/functional/cases/features/#206.treat-single-line-breaks-as-br.html b/test/functional/makehtml/cases/features/#206.treat-single-line-breaks-as-br.html
similarity index 100%
rename from test/functional/cases/features/#206.treat-single-line-breaks-as-br.html
rename to test/functional/makehtml/cases/features/#206.treat-single-line-breaks-as-br.html
diff --git a/test/functional/cases/features/#206.treat-single-line-breaks-as-br.md b/test/functional/makehtml/cases/features/#206.treat-single-line-breaks-as-br.md
similarity index 100%
rename from test/functional/cases/features/#206.treat-single-line-breaks-as-br.md
rename to test/functional/makehtml/cases/features/#206.treat-single-line-breaks-as-br.md
diff --git a/test/functional/cases/features/#214.escaped-markdown-chars-break-strikethrough.html b/test/functional/makehtml/cases/features/#214.escaped-markdown-chars-break-strikethrough.html
similarity index 100%
rename from test/functional/cases/features/#214.escaped-markdown-chars-break-strikethrough.html
rename to test/functional/makehtml/cases/features/#214.escaped-markdown-chars-break-strikethrough.html
diff --git a/test/functional/cases/features/#214.escaped-markdown-chars-break-strikethrough.md b/test/functional/makehtml/cases/features/#214.escaped-markdown-chars-break-strikethrough.md
similarity index 100%
rename from test/functional/cases/features/#214.escaped-markdown-chars-break-strikethrough.md
rename to test/functional/makehtml/cases/features/#214.escaped-markdown-chars-break-strikethrough.md
diff --git a/test/functional/cases/features/#259.es6-template-strings-indentation-issues.html b/test/functional/makehtml/cases/features/#259.es6-template-strings-indentation-issues.html
similarity index 100%
rename from test/functional/cases/features/#259.es6-template-strings-indentation-issues.html
rename to test/functional/makehtml/cases/features/#259.es6-template-strings-indentation-issues.html
diff --git a/test/functional/cases/features/#259.es6-template-strings-indentation-issues.md b/test/functional/makehtml/cases/features/#259.es6-template-strings-indentation-issues.md
similarity index 100%
rename from test/functional/cases/features/#259.es6-template-strings-indentation-issues.md
rename to test/functional/makehtml/cases/features/#259.es6-template-strings-indentation-issues.md
diff --git a/test/functional/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.html b/test/functional/makehtml/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.html
similarity index 100%
rename from test/functional/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.html
rename to test/functional/makehtml/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.html
diff --git a/test/functional/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.md b/test/functional/makehtml/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.md
similarity index 100%
rename from test/functional/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.md
rename to test/functional/makehtml/cases/features/#284.simplifiedAutoLink-does-not-match-GFM-style.md
diff --git a/test/functional/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.html b/test/functional/makehtml/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.html
similarity index 100%
rename from test/functional/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.html
rename to test/functional/makehtml/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.html
diff --git a/test/functional/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.md b/test/functional/makehtml/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.md
similarity index 100%
rename from test/functional/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.md
rename to test/functional/makehtml/cases/features/#316.new-simpleLineBreaks-option-breaks-lists.md
diff --git a/test/functional/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.html b/test/functional/makehtml/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.html
similarity index 100%
rename from test/functional/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.html
rename to test/functional/makehtml/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.html
diff --git a/test/functional/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.md b/test/functional/makehtml/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.md
similarity index 100%
rename from test/functional/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.md
rename to test/functional/makehtml/cases/features/#318.simpleLineBreaks-does-not-work-with-chinese-characters.md
diff --git a/test/functional/cases/features/#320.github-compatible-generated-header-id.html b/test/functional/makehtml/cases/features/#320.github-compatible-generated-header-id.html
similarity index 100%
rename from test/functional/cases/features/#320.github-compatible-generated-header-id.html
rename to test/functional/makehtml/cases/features/#320.github-compatible-generated-header-id.html
diff --git a/test/functional/cases/features/#320.github-compatible-generated-header-id.md b/test/functional/makehtml/cases/features/#320.github-compatible-generated-header-id.md
similarity index 100%
rename from test/functional/cases/features/#320.github-compatible-generated-header-id.md
rename to test/functional/makehtml/cases/features/#320.github-compatible-generated-header-id.md
diff --git a/test/functional/cases/features/#323.simpleLineBreaks-breaks-with-strong.html b/test/functional/makehtml/cases/features/#323.simpleLineBreaks-breaks-with-strong.html
similarity index 100%
rename from test/functional/cases/features/#323.simpleLineBreaks-breaks-with-strong.html
rename to test/functional/makehtml/cases/features/#323.simpleLineBreaks-breaks-with-strong.html
diff --git a/test/functional/cases/features/#323.simpleLineBreaks-breaks-with-strong.md b/test/functional/makehtml/cases/features/#323.simpleLineBreaks-breaks-with-strong.md
similarity index 100%
rename from test/functional/cases/features/#323.simpleLineBreaks-breaks-with-strong.md
rename to test/functional/makehtml/cases/features/#323.simpleLineBreaks-breaks-with-strong.md
diff --git a/test/functional/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html b/test/functional/makehtml/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html
similarity index 100%
rename from test/functional/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html
rename to test/functional/makehtml/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html
diff --git a/test/functional/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md b/test/functional/makehtml/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md
similarity index 100%
rename from test/functional/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md
rename to test/functional/makehtml/cases/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md
diff --git a/test/functional/cases/features/#331.allow-escaping-of-tilde.html b/test/functional/makehtml/cases/features/#331.allow-escaping-of-tilde.html
similarity index 100%
rename from test/functional/cases/features/#331.allow-escaping-of-tilde.html
rename to test/functional/makehtml/cases/features/#331.allow-escaping-of-tilde.html
diff --git a/test/functional/cases/features/#331.allow-escaping-of-tilde.md b/test/functional/makehtml/cases/features/#331.allow-escaping-of-tilde.md
similarity index 100%
rename from test/functional/cases/features/#331.allow-escaping-of-tilde.md
rename to test/functional/makehtml/cases/features/#331.allow-escaping-of-tilde.md
diff --git a/test/functional/cases/features/#374.escape-html-tags.html b/test/functional/makehtml/cases/features/#374.escape-html-tags.html
similarity index 100%
rename from test/functional/cases/features/#374.escape-html-tags.html
rename to test/functional/makehtml/cases/features/#374.escape-html-tags.html
diff --git a/test/functional/cases/features/#374.escape-html-tags.md b/test/functional/makehtml/cases/features/#374.escape-html-tags.md
similarity index 100%
rename from test/functional/cases/features/#374.escape-html-tags.md
rename to test/functional/makehtml/cases/features/#374.escape-html-tags.md
diff --git a/test/functional/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html b/test/functional/makehtml/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html
similarity index 100%
rename from test/functional/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html
rename to test/functional/makehtml/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html
diff --git a/test/functional/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md b/test/functional/makehtml/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md
similarity index 100%
rename from test/functional/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md
rename to test/functional/makehtml/cases/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md
diff --git a/test/functional/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html b/test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html
similarity index 100%
rename from test/functional/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html
rename to test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html
diff --git a/test/functional/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.md b/test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.md
similarity index 100%
rename from test/functional/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.md
rename to test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.md
diff --git a/test/functional/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.html b/test/functional/makehtml/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.html
similarity index 100%
rename from test/functional/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.html
rename to test/functional/makehtml/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.html
diff --git a/test/functional/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.md b/test/functional/makehtml/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.md
similarity index 100%
rename from test/functional/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.md
rename to test/functional/makehtml/cases/features/#398.literalMidWordAsterisks-treats-non-word-characters-as-characters.md
diff --git a/test/functional/cases/features/#69.header-level-start.html b/test/functional/makehtml/cases/features/#69.header-level-start.html
similarity index 100%
rename from test/functional/cases/features/#69.header-level-start.html
rename to test/functional/makehtml/cases/features/#69.header-level-start.html
diff --git a/test/functional/cases/features/#69.header-level-start.md b/test/functional/makehtml/cases/features/#69.header-level-start.md
similarity index 100%
rename from test/functional/cases/features/#69.header-level-start.md
rename to test/functional/makehtml/cases/features/#69.header-level-start.md
diff --git a/test/functional/cases/features/completeHTMLOutput/simple.html b/test/functional/makehtml/cases/features/completeHTMLOutput/simple.html
similarity index 100%
rename from test/functional/cases/features/completeHTMLOutput/simple.html
rename to test/functional/makehtml/cases/features/completeHTMLOutput/simple.html
diff --git a/test/functional/cases/features/completeHTMLOutput/simple.md b/test/functional/makehtml/cases/features/completeHTMLOutput/simple.md
similarity index 100%
rename from test/functional/cases/features/completeHTMLOutput/simple.md
rename to test/functional/makehtml/cases/features/completeHTMLOutput/simple.md
diff --git a/test/functional/cases/features/customizedHeaderId-simple.html b/test/functional/makehtml/cases/features/customizedHeaderId-simple.html
similarity index 100%
rename from test/functional/cases/features/customizedHeaderId-simple.html
rename to test/functional/makehtml/cases/features/customizedHeaderId-simple.html
diff --git a/test/functional/cases/features/customizedHeaderId-simple.md b/test/functional/makehtml/cases/features/customizedHeaderId-simple.md
similarity index 100%
rename from test/functional/cases/features/customizedHeaderId-simple.md
rename to test/functional/makehtml/cases/features/customizedHeaderId-simple.md
diff --git a/test/functional/cases/features/disable-email-encoding.html b/test/functional/makehtml/cases/features/disable-email-encoding.html
similarity index 100%
rename from test/functional/cases/features/disable-email-encoding.html
rename to test/functional/makehtml/cases/features/disable-email-encoding.html
diff --git a/test/functional/cases/features/disable-email-encoding.md b/test/functional/makehtml/cases/features/disable-email-encoding.md
similarity index 100%
rename from test/functional/cases/features/disable-email-encoding.md
rename to test/functional/makehtml/cases/features/disable-email-encoding.md
diff --git a/test/functional/cases/features/disable-gh-codeblocks.html b/test/functional/makehtml/cases/features/disable-gh-codeblocks.html
similarity index 100%
rename from test/functional/cases/features/disable-gh-codeblocks.html
rename to test/functional/makehtml/cases/features/disable-gh-codeblocks.html
diff --git a/test/functional/cases/features/disable-gh-codeblocks.md b/test/functional/makehtml/cases/features/disable-gh-codeblocks.md
similarity index 100%
rename from test/functional/cases/features/disable-gh-codeblocks.md
rename to test/functional/makehtml/cases/features/disable-gh-codeblocks.md
diff --git a/test/functional/cases/features/disableForced4SpacesIndentedSublists.html b/test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists.html
similarity index 100%
rename from test/functional/cases/features/disableForced4SpacesIndentedSublists.html
rename to test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists.html
diff --git a/test/functional/cases/features/disableForced4SpacesIndentedSublists.md b/test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists.md
similarity index 100%
rename from test/functional/cases/features/disableForced4SpacesIndentedSublists.md
rename to test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists.md
diff --git a/test/functional/cases/features/disableForced4SpacesIndentedSublists/.gitkeep b/test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists/.gitkeep
similarity index 100%
rename from test/functional/cases/features/disableForced4SpacesIndentedSublists/.gitkeep
rename to test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists/.gitkeep
diff --git a/test/functional/cases/features/emojis/complex.html b/test/functional/makehtml/cases/features/emojis/complex.html
similarity index 100%
rename from test/functional/cases/features/emojis/complex.html
rename to test/functional/makehtml/cases/features/emojis/complex.html
diff --git a/test/functional/cases/features/emojis/complex.md b/test/functional/makehtml/cases/features/emojis/complex.md
similarity index 100%
rename from test/functional/cases/features/emojis/complex.md
rename to test/functional/makehtml/cases/features/emojis/complex.md
diff --git a/test/functional/cases/features/emojis/links.html b/test/functional/makehtml/cases/features/emojis/links.html
similarity index 100%
rename from test/functional/cases/features/emojis/links.html
rename to test/functional/makehtml/cases/features/emojis/links.html
diff --git a/test/functional/cases/features/emojis/links.md b/test/functional/makehtml/cases/features/emojis/links.md
similarity index 100%
rename from test/functional/cases/features/emojis/links.md
rename to test/functional/makehtml/cases/features/emojis/links.md
diff --git a/test/functional/cases/features/emojis/simple.html b/test/functional/makehtml/cases/features/emojis/simple.html
similarity index 100%
rename from test/functional/cases/features/emojis/simple.html
rename to test/functional/makehtml/cases/features/emojis/simple.html
diff --git a/test/functional/cases/features/emojis/simple.md b/test/functional/makehtml/cases/features/emojis/simple.md
similarity index 100%
rename from test/functional/cases/features/emojis/simple.md
rename to test/functional/makehtml/cases/features/emojis/simple.md
diff --git a/test/functional/cases/features/emojis/simplifiedautolinks.html b/test/functional/makehtml/cases/features/emojis/simplifiedautolinks.html
similarity index 100%
rename from test/functional/cases/features/emojis/simplifiedautolinks.html
rename to test/functional/makehtml/cases/features/emojis/simplifiedautolinks.html
diff --git a/test/functional/cases/features/emojis/simplifiedautolinks.md b/test/functional/makehtml/cases/features/emojis/simplifiedautolinks.md
similarity index 100%
rename from test/functional/cases/features/emojis/simplifiedautolinks.md
rename to test/functional/makehtml/cases/features/emojis/simplifiedautolinks.md
diff --git a/test/functional/cases/features/emojis/special.html b/test/functional/makehtml/cases/features/emojis/special.html
similarity index 100%
rename from test/functional/cases/features/emojis/special.html
rename to test/functional/makehtml/cases/features/emojis/special.html
diff --git a/test/functional/cases/features/emojis/special.md b/test/functional/makehtml/cases/features/emojis/special.md
similarity index 100%
rename from test/functional/cases/features/emojis/special.md
rename to test/functional/makehtml/cases/features/emojis/special.md
diff --git a/test/functional/cases/features/excludeTrailingPunctuationFromURLs-option.html b/test/functional/makehtml/cases/features/excludeTrailingPunctuationFromURLs-option.html
similarity index 100%
rename from test/functional/cases/features/excludeTrailingPunctuationFromURLs-option.html
rename to test/functional/makehtml/cases/features/excludeTrailingPunctuationFromURLs-option.html
diff --git a/test/functional/cases/features/excludeTrailingPunctuationFromURLs-option.md b/test/functional/makehtml/cases/features/excludeTrailingPunctuationFromURLs-option.md
similarity index 100%
rename from test/functional/cases/features/excludeTrailingPunctuationFromURLs-option.md
rename to test/functional/makehtml/cases/features/excludeTrailingPunctuationFromURLs-option.md
diff --git a/test/functional/cases/features/ghMentions.html b/test/functional/makehtml/cases/features/ghMentions.html
similarity index 100%
rename from test/functional/cases/features/ghMentions.html
rename to test/functional/makehtml/cases/features/ghMentions.html
diff --git a/test/functional/cases/features/ghMentions.md b/test/functional/makehtml/cases/features/ghMentions.md
similarity index 100%
rename from test/functional/cases/features/ghMentions.md
rename to test/functional/makehtml/cases/features/ghMentions.md
diff --git a/test/functional/cases/features/literalMidWordAsterisks/basic.html b/test/functional/makehtml/cases/features/literalMidWordAsterisks/basic.html
similarity index 100%
rename from test/functional/cases/features/literalMidWordAsterisks/basic.html
rename to test/functional/makehtml/cases/features/literalMidWordAsterisks/basic.html
diff --git a/test/functional/cases/features/literalMidWordAsterisks/basic.md b/test/functional/makehtml/cases/features/literalMidWordAsterisks/basic.md
similarity index 100%
rename from test/functional/cases/features/literalMidWordAsterisks/basic.md
rename to test/functional/makehtml/cases/features/literalMidWordAsterisks/basic.md
diff --git a/test/functional/cases/features/literalMidWordAsterisks/punctation-test.html b/test/functional/makehtml/cases/features/literalMidWordAsterisks/punctation-test.html
similarity index 100%
rename from test/functional/cases/features/literalMidWordAsterisks/punctation-test.html
rename to test/functional/makehtml/cases/features/literalMidWordAsterisks/punctation-test.html
diff --git a/test/functional/cases/features/literalMidWordAsterisks/punctation-test.md b/test/functional/makehtml/cases/features/literalMidWordAsterisks/punctation-test.md
similarity index 100%
rename from test/functional/cases/features/literalMidWordAsterisks/punctation-test.md
rename to test/functional/makehtml/cases/features/literalMidWordAsterisks/punctation-test.md
diff --git a/test/functional/cases/features/literalMidWordUnderscores/basic.html b/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.html
similarity index 100%
rename from test/functional/cases/features/literalMidWordUnderscores/basic.html
rename to test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.html
diff --git a/test/functional/cases/features/literalMidWordUnderscores/basic.md b/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.md
similarity index 100%
rename from test/functional/cases/features/literalMidWordUnderscores/basic.md
rename to test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.md
diff --git a/test/functional/cases/features/literalMidWordUnderscores/punctation-test.html b/test/functional/makehtml/cases/features/literalMidWordUnderscores/punctation-test.html
similarity index 100%
rename from test/functional/cases/features/literalMidWordUnderscores/punctation-test.html
rename to test/functional/makehtml/cases/features/literalMidWordUnderscores/punctation-test.html
diff --git a/test/functional/cases/features/literalMidWordUnderscores/punctation-test.md b/test/functional/makehtml/cases/features/literalMidWordUnderscores/punctation-test.md
similarity index 100%
rename from test/functional/cases/features/literalMidWordUnderscores/punctation-test.md
rename to test/functional/makehtml/cases/features/literalMidWordUnderscores/punctation-test.md
diff --git a/test/functional/cases/features/metadata/dashes-conflict.html b/test/functional/makehtml/cases/features/metadata/dashes-conflict.html
similarity index 100%
rename from test/functional/cases/features/metadata/dashes-conflict.html
rename to test/functional/makehtml/cases/features/metadata/dashes-conflict.html
diff --git a/test/functional/cases/features/metadata/dashes-conflict.md b/test/functional/makehtml/cases/features/metadata/dashes-conflict.md
similarity index 100%
rename from test/functional/cases/features/metadata/dashes-conflict.md
rename to test/functional/makehtml/cases/features/metadata/dashes-conflict.md
diff --git a/test/functional/cases/features/metadata/embeded-in-output.html b/test/functional/makehtml/cases/features/metadata/embeded-in-output.html
similarity index 100%
rename from test/functional/cases/features/metadata/embeded-in-output.html
rename to test/functional/makehtml/cases/features/metadata/embeded-in-output.html
diff --git a/test/functional/cases/features/metadata/embeded-in-output.md b/test/functional/makehtml/cases/features/metadata/embeded-in-output.md
similarity index 100%
rename from test/functional/cases/features/metadata/embeded-in-output.md
rename to test/functional/makehtml/cases/features/metadata/embeded-in-output.md
diff --git a/test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.html b/test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.html
similarity index 100%
rename from test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.html
rename to test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.html
diff --git a/test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.md b/test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.md
similarity index 100%
rename from test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.md
rename to test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks-different-symbols.md
diff --git a/test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks.html b/test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks.html
similarity index 100%
rename from test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks.html
rename to test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks.html
diff --git a/test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks.md b/test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks.md
similarity index 100%
rename from test/functional/cases/features/metadata/embeded-two-consecutive-metadata-blocks.md
rename to test/functional/makehtml/cases/features/metadata/embeded-two-consecutive-metadata-blocks.md
diff --git a/test/functional/cases/features/metadata/ignore-metadata.html b/test/functional/makehtml/cases/features/metadata/ignore-metadata.html
similarity index 100%
rename from test/functional/cases/features/metadata/ignore-metadata.html
rename to test/functional/makehtml/cases/features/metadata/ignore-metadata.html
diff --git a/test/functional/cases/features/metadata/ignore-metadata.md b/test/functional/makehtml/cases/features/metadata/ignore-metadata.md
similarity index 100%
rename from test/functional/cases/features/metadata/ignore-metadata.md
rename to test/functional/makehtml/cases/features/metadata/ignore-metadata.md
diff --git a/test/functional/cases/features/metadata/simple-angled-for-method.html b/test/functional/makehtml/cases/features/metadata/simple-angled-for-method.html
similarity index 100%
rename from test/functional/cases/features/metadata/simple-angled-for-method.html
rename to test/functional/makehtml/cases/features/metadata/simple-angled-for-method.html
diff --git a/test/functional/cases/features/metadata/simple-angled-for-method.md b/test/functional/makehtml/cases/features/metadata/simple-angled-for-method.md
similarity index 100%
rename from test/functional/cases/features/metadata/simple-angled-for-method.md
rename to test/functional/makehtml/cases/features/metadata/simple-angled-for-method.md
diff --git a/test/functional/cases/features/metadata/simple-angled-quotes.html b/test/functional/makehtml/cases/features/metadata/simple-angled-quotes.html
similarity index 100%
rename from test/functional/cases/features/metadata/simple-angled-quotes.html
rename to test/functional/makehtml/cases/features/metadata/simple-angled-quotes.html
diff --git a/test/functional/cases/features/metadata/simple-angled-quotes.md b/test/functional/makehtml/cases/features/metadata/simple-angled-quotes.md
similarity index 100%
rename from test/functional/cases/features/metadata/simple-angled-quotes.md
rename to test/functional/makehtml/cases/features/metadata/simple-angled-quotes.md
diff --git a/test/functional/cases/features/metadata/simple-three-dashes.html b/test/functional/makehtml/cases/features/metadata/simple-three-dashes.html
similarity index 100%
rename from test/functional/cases/features/metadata/simple-three-dashes.html
rename to test/functional/makehtml/cases/features/metadata/simple-three-dashes.html
diff --git a/test/functional/cases/features/metadata/simple-three-dashes.md b/test/functional/makehtml/cases/features/metadata/simple-three-dashes.md
similarity index 100%
rename from test/functional/cases/features/metadata/simple-three-dashes.md
rename to test/functional/makehtml/cases/features/metadata/simple-three-dashes.md
diff --git a/test/functional/cases/features/metadata/simple-with-format.html b/test/functional/makehtml/cases/features/metadata/simple-with-format.html
similarity index 100%
rename from test/functional/cases/features/metadata/simple-with-format.html
rename to test/functional/makehtml/cases/features/metadata/simple-with-format.html
diff --git a/test/functional/cases/features/metadata/simple-with-format.md b/test/functional/makehtml/cases/features/metadata/simple-with-format.md
similarity index 100%
rename from test/functional/cases/features/metadata/simple-with-format.md
rename to test/functional/makehtml/cases/features/metadata/simple-with-format.md
diff --git a/test/functional/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.html
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.html
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.html
diff --git a/test/functional/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.md b/test/functional/makehtml/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.md
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.md
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/hash-links-open-in-same-page.md
diff --git a/test/functional/cases/features/openLinksInNewWindow/simple-cases.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.html
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/simple-cases.html
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.html
diff --git a/test/functional/cases/features/openLinksInNewWindow/simple-cases.md b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.md
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/simple-cases.md
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.md
diff --git a/test/functional/cases/features/openLinksInNewWindow/simple.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple.html
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/simple.html
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/simple.html
diff --git a/test/functional/cases/features/openLinksInNewWindow/simple.md b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple.md
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/simple.md
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/simple.md
diff --git a/test/functional/cases/features/openLinksInNewWindow/simplifiedAutoLink.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.html
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/simplifiedAutoLink.html
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.html
diff --git a/test/functional/cases/features/openLinksInNewWindow/simplifiedAutoLink.md b/test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.md
similarity index 100%
rename from test/functional/cases/features/openLinksInNewWindow/simplifiedAutoLink.md
rename to test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.md
diff --git a/test/functional/cases/features/prefixHeaderId-simple.html b/test/functional/makehtml/cases/features/prefixHeaderId-simple.html
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-simple.html
rename to test/functional/makehtml/cases/features/prefixHeaderId-simple.html
diff --git a/test/functional/cases/features/prefixHeaderId-simple.md b/test/functional/makehtml/cases/features/prefixHeaderId-simple.md
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-simple.md
rename to test/functional/makehtml/cases/features/prefixHeaderId-simple.md
diff --git a/test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.html b/test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.html
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.html
rename to test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.html
diff --git a/test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.md b/test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.md
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.md
rename to test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId.md
diff --git a/test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.html b/test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.html
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.html
rename to test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.html
diff --git a/test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.md b/test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.md
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.md
rename to test/functional/makehtml/cases/features/prefixHeaderId-string-and-ghCompatibleHeaderId2.md
diff --git a/test/functional/cases/features/prefixHeaderId-string.html b/test/functional/makehtml/cases/features/prefixHeaderId-string.html
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-string.html
rename to test/functional/makehtml/cases/features/prefixHeaderId-string.html
diff --git a/test/functional/cases/features/prefixHeaderId-string.md b/test/functional/makehtml/cases/features/prefixHeaderId-string.md
similarity index 100%
rename from test/functional/cases/features/prefixHeaderId-string.md
rename to test/functional/makehtml/cases/features/prefixHeaderId-string.md
diff --git a/test/functional/cases/features/rawHeaderId/simple.html b/test/functional/makehtml/cases/features/rawHeaderId/simple.html
similarity index 100%
rename from test/functional/cases/features/rawHeaderId/simple.html
rename to test/functional/makehtml/cases/features/rawHeaderId/simple.html
diff --git a/test/functional/cases/features/rawHeaderId/simple.md b/test/functional/makehtml/cases/features/rawHeaderId/simple.md
similarity index 100%
rename from test/functional/cases/features/rawHeaderId/simple.md
rename to test/functional/makehtml/cases/features/rawHeaderId/simple.md
diff --git a/test/functional/cases/features/rawHeaderId/with-prefixHeaderId.html b/test/functional/makehtml/cases/features/rawHeaderId/with-prefixHeaderId.html
similarity index 100%
rename from test/functional/cases/features/rawHeaderId/with-prefixHeaderId.html
rename to test/functional/makehtml/cases/features/rawHeaderId/with-prefixHeaderId.html
diff --git a/test/functional/cases/features/rawHeaderId/with-prefixHeaderId.md b/test/functional/makehtml/cases/features/rawHeaderId/with-prefixHeaderId.md
similarity index 100%
rename from test/functional/cases/features/rawHeaderId/with-prefixHeaderId.md
rename to test/functional/makehtml/cases/features/rawHeaderId/with-prefixHeaderId.md
diff --git a/test/functional/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.html b/test/functional/makehtml/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.html
similarity index 100%
rename from test/functional/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.html
rename to test/functional/makehtml/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.html
diff --git a/test/functional/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.md b/test/functional/makehtml/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.md
similarity index 100%
rename from test/functional/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.md
rename to test/functional/makehtml/cases/features/rawPrefixHeaderId/simple-with-prefixHeaderId.md
diff --git a/test/functional/cases/features/requireSpaceBeforeHeadingText.html b/test/functional/makehtml/cases/features/requireSpaceBeforeHeadingText.html
similarity index 100%
rename from test/functional/cases/features/requireSpaceBeforeHeadingText.html
rename to test/functional/makehtml/cases/features/requireSpaceBeforeHeadingText.html
diff --git a/test/functional/cases/features/requireSpaceBeforeHeadingText.md b/test/functional/makehtml/cases/features/requireSpaceBeforeHeadingText.md
similarity index 100%
rename from test/functional/cases/features/requireSpaceBeforeHeadingText.md
rename to test/functional/makehtml/cases/features/requireSpaceBeforeHeadingText.md
diff --git a/test/functional/cases/features/simpleLineBreaks-handle-html-pre.html b/test/functional/makehtml/cases/features/simpleLineBreaks-handle-html-pre.html
similarity index 100%
rename from test/functional/cases/features/simpleLineBreaks-handle-html-pre.html
rename to test/functional/makehtml/cases/features/simpleLineBreaks-handle-html-pre.html
diff --git a/test/functional/cases/features/simpleLineBreaks-handle-html-pre.md b/test/functional/makehtml/cases/features/simpleLineBreaks-handle-html-pre.md
similarity index 100%
rename from test/functional/cases/features/simpleLineBreaks-handle-html-pre.md
rename to test/functional/makehtml/cases/features/simpleLineBreaks-handle-html-pre.md
diff --git a/test/functional/cases/features/simpleLineBreaks2.html b/test/functional/makehtml/cases/features/simpleLineBreaks2.html
similarity index 100%
rename from test/functional/cases/features/simpleLineBreaks2.html
rename to test/functional/makehtml/cases/features/simpleLineBreaks2.html
diff --git a/test/functional/cases/features/simpleLineBreaks2.md b/test/functional/makehtml/cases/features/simpleLineBreaks2.md
similarity index 100%
rename from test/functional/cases/features/simpleLineBreaks2.md
rename to test/functional/makehtml/cases/features/simpleLineBreaks2.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/autolinks-with-magic-chars.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/blockquote.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/blockquote.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/blockquote.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/blockquote.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/blockquote.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/blockquote.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/blockquote.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/blockquote.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/disallow-underscores.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/disallow-underscores.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/disallow-underscores.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/disallow-underscores.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/disallow-underscores.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/disallow-underscores.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/disallow-underscores.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/disallow-underscores.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-code.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-code.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-code.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-code.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-code.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-code.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/does-not-parse-inside-code.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-inside-code.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/does-not-parse-reference-links.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-reference-links.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/does-not-parse-reference-links.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-reference-links.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/does-not-parse-reference-links.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-reference-links.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/does-not-parse-reference-links.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/does-not-parse-reference-links.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/emphasis-and-strikethrough.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/ordered-lists.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/ordered-lists.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/ordered-lists.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/ordered-lists.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/ordered-lists.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/ordered-lists.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/ordered-lists.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/ordered-lists.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/text.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/text.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/text.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/text.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/text.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/text.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/text.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/text.md
diff --git a/test/functional/cases/features/simplifiedAutoLink/unordered-lists.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/unordered-lists.html
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/unordered-lists.html
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/unordered-lists.html
diff --git a/test/functional/cases/features/simplifiedAutoLink/unordered-lists.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/unordered-lists.md
similarity index 100%
rename from test/functional/cases/features/simplifiedAutoLink/unordered-lists.md
rename to test/functional/makehtml/cases/features/simplifiedAutoLink/unordered-lists.md
diff --git a/test/functional/cases/features/splitAdjacentBlockquotes/basic.html b/test/functional/makehtml/cases/features/splitAdjacentBlockquotes/basic.html
similarity index 100%
rename from test/functional/cases/features/splitAdjacentBlockquotes/basic.html
rename to test/functional/makehtml/cases/features/splitAdjacentBlockquotes/basic.html
diff --git a/test/functional/cases/features/splitAdjacentBlockquotes/basic.md b/test/functional/makehtml/cases/features/splitAdjacentBlockquotes/basic.md
similarity index 100%
rename from test/functional/cases/features/splitAdjacentBlockquotes/basic.md
rename to test/functional/makehtml/cases/features/splitAdjacentBlockquotes/basic.md
diff --git a/test/functional/cases/features/splitAdjacentBlockquotes/multiline-paragraph.html b/test/functional/makehtml/cases/features/splitAdjacentBlockquotes/multiline-paragraph.html
similarity index 100%
rename from test/functional/cases/features/splitAdjacentBlockquotes/multiline-paragraph.html
rename to test/functional/makehtml/cases/features/splitAdjacentBlockquotes/multiline-paragraph.html
diff --git a/test/functional/cases/features/splitAdjacentBlockquotes/multiline-paragraph.md b/test/functional/makehtml/cases/features/splitAdjacentBlockquotes/multiline-paragraph.md
similarity index 100%
rename from test/functional/cases/features/splitAdjacentBlockquotes/multiline-paragraph.md
rename to test/functional/makehtml/cases/features/splitAdjacentBlockquotes/multiline-paragraph.md
diff --git a/test/functional/cases/features/tables/#179.parse-md-in-table-ths.html b/test/functional/makehtml/cases/features/tables/#179.parse-md-in-table-ths.html
similarity index 100%
rename from test/functional/cases/features/tables/#179.parse-md-in-table-ths.html
rename to test/functional/makehtml/cases/features/tables/#179.parse-md-in-table-ths.html
diff --git a/test/functional/cases/features/tables/#179.parse-md-in-table-ths.md b/test/functional/makehtml/cases/features/tables/#179.parse-md-in-table-ths.md
similarity index 100%
rename from test/functional/cases/features/tables/#179.parse-md-in-table-ths.md
rename to test/functional/makehtml/cases/features/tables/#179.parse-md-in-table-ths.md
diff --git a/test/functional/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.html b/test/functional/makehtml/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.html
similarity index 100%
rename from test/functional/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.html
rename to test/functional/makehtml/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.html
diff --git a/test/functional/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.md b/test/functional/makehtml/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.md
similarity index 100%
rename from test/functional/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.md
rename to test/functional/makehtml/cases/features/tables/#256.table-header-separators-should-not-require-3-dashes.md
diff --git a/test/functional/cases/features/tables/#345.escape-pipe-character.html b/test/functional/makehtml/cases/features/tables/#345.escape-pipe-character.html
similarity index 100%
rename from test/functional/cases/features/tables/#345.escape-pipe-character.html
rename to test/functional/makehtml/cases/features/tables/#345.escape-pipe-character.html
diff --git a/test/functional/cases/features/tables/#345.escape-pipe-character.md b/test/functional/makehtml/cases/features/tables/#345.escape-pipe-character.md
similarity index 100%
rename from test/functional/cases/features/tables/#345.escape-pipe-character.md
rename to test/functional/makehtml/cases/features/tables/#345.escape-pipe-character.md
diff --git a/test/functional/cases/features/tables/#406.does-not-render-one-column-tables.html b/test/functional/makehtml/cases/features/tables/#406.does-not-render-one-column-tables.html
similarity index 100%
rename from test/functional/cases/features/tables/#406.does-not-render-one-column-tables.html
rename to test/functional/makehtml/cases/features/tables/#406.does-not-render-one-column-tables.html
diff --git a/test/functional/cases/features/tables/#406.does-not-render-one-column-tables.md b/test/functional/makehtml/cases/features/tables/#406.does-not-render-one-column-tables.md
similarity index 100%
rename from test/functional/cases/features/tables/#406.does-not-render-one-column-tables.md
rename to test/functional/makehtml/cases/features/tables/#406.does-not-render-one-column-tables.md
diff --git a/test/functional/cases/features/tables/#442.trailing-spaces-break-one-column-tables.html b/test/functional/makehtml/cases/features/tables/#442.trailing-spaces-break-one-column-tables.html
similarity index 100%
rename from test/functional/cases/features/tables/#442.trailing-spaces-break-one-column-tables.html
rename to test/functional/makehtml/cases/features/tables/#442.trailing-spaces-break-one-column-tables.html
diff --git a/test/functional/cases/features/tables/#442.trailing-spaces-break-one-column-tables.md b/test/functional/makehtml/cases/features/tables/#442.trailing-spaces-break-one-column-tables.md
similarity index 100%
rename from test/functional/cases/features/tables/#442.trailing-spaces-break-one-column-tables.md
rename to test/functional/makehtml/cases/features/tables/#442.trailing-spaces-break-one-column-tables.md
diff --git a/test/functional/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.html b/test/functional/makehtml/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.html
similarity index 100%
rename from test/functional/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.html
rename to test/functional/makehtml/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.html
diff --git a/test/functional/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md b/test/functional/makehtml/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md
similarity index 100%
rename from test/functional/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md
rename to test/functional/makehtml/cases/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md
diff --git a/test/functional/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html b/test/functional/makehtml/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html
similarity index 100%
rename from test/functional/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html
rename to test/functional/makehtml/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html
diff --git a/test/functional/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md b/test/functional/makehtml/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md
similarity index 100%
rename from test/functional/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md
rename to test/functional/makehtml/cases/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md
diff --git a/test/functional/cases/features/tables/#465.code-spans-with-pipes-break-table.html b/test/functional/makehtml/cases/features/tables/#465.code-spans-with-pipes-break-table.html
similarity index 100%
rename from test/functional/cases/features/tables/#465.code-spans-with-pipes-break-table.html
rename to test/functional/makehtml/cases/features/tables/#465.code-spans-with-pipes-break-table.html
diff --git a/test/functional/cases/features/tables/#465.code-spans-with-pipes-break-table.md b/test/functional/makehtml/cases/features/tables/#465.code-spans-with-pipes-break-table.md
similarity index 100%
rename from test/functional/cases/features/tables/#465.code-spans-with-pipes-break-table.md
rename to test/functional/makehtml/cases/features/tables/#465.code-spans-with-pipes-break-table.md
diff --git a/test/functional/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.html b/test/functional/makehtml/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.html
similarity index 100%
rename from test/functional/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.html
rename to test/functional/makehtml/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.html
diff --git a/test/functional/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.md b/test/functional/makehtml/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.md
similarity index 100%
rename from test/functional/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.md
rename to test/functional/makehtml/cases/features/tables/#471.ol-is-not-rendered-correctly-inside-table.md
diff --git a/test/functional/cases/features/tables/basic-alignment.html b/test/functional/makehtml/cases/features/tables/basic-alignment.html
similarity index 100%
rename from test/functional/cases/features/tables/basic-alignment.html
rename to test/functional/makehtml/cases/features/tables/basic-alignment.html
diff --git a/test/functional/cases/features/tables/basic-alignment.md b/test/functional/makehtml/cases/features/tables/basic-alignment.md
similarity index 100%
rename from test/functional/cases/features/tables/basic-alignment.md
rename to test/functional/makehtml/cases/features/tables/basic-alignment.md
diff --git a/test/functional/cases/features/tables/basic-with-header-ids.html b/test/functional/makehtml/cases/features/tables/basic-with-header-ids.html
similarity index 100%
rename from test/functional/cases/features/tables/basic-with-header-ids.html
rename to test/functional/makehtml/cases/features/tables/basic-with-header-ids.html
diff --git a/test/functional/cases/features/tables/basic-with-header-ids.md b/test/functional/makehtml/cases/features/tables/basic-with-header-ids.md
similarity index 100%
rename from test/functional/cases/features/tables/basic-with-header-ids.md
rename to test/functional/makehtml/cases/features/tables/basic-with-header-ids.md
diff --git a/test/functional/cases/features/tables/basic.html b/test/functional/makehtml/cases/features/tables/basic.html
similarity index 100%
rename from test/functional/cases/features/tables/basic.html
rename to test/functional/makehtml/cases/features/tables/basic.html
diff --git a/test/functional/cases/features/tables/basic.md b/test/functional/makehtml/cases/features/tables/basic.md
similarity index 100%
rename from test/functional/cases/features/tables/basic.md
rename to test/functional/makehtml/cases/features/tables/basic.md
diff --git a/test/functional/cases/features/tables/gh-style-tables.html b/test/functional/makehtml/cases/features/tables/gh-style-tables.html
similarity index 100%
rename from test/functional/cases/features/tables/gh-style-tables.html
rename to test/functional/makehtml/cases/features/tables/gh-style-tables.html
diff --git a/test/functional/cases/features/tables/gh-style-tables.md b/test/functional/makehtml/cases/features/tables/gh-style-tables.md
similarity index 100%
rename from test/functional/cases/features/tables/gh-style-tables.md
rename to test/functional/makehtml/cases/features/tables/gh-style-tables.md
diff --git a/test/functional/cases/features/tables/large-table-with-allignments.html b/test/functional/makehtml/cases/features/tables/large-table-with-allignments.html
similarity index 100%
rename from test/functional/cases/features/tables/large-table-with-allignments.html
rename to test/functional/makehtml/cases/features/tables/large-table-with-allignments.html
diff --git a/test/functional/cases/features/tables/large-table-with-allignments.md b/test/functional/makehtml/cases/features/tables/large-table-with-allignments.md
similarity index 100%
rename from test/functional/cases/features/tables/large-table-with-allignments.md
rename to test/functional/makehtml/cases/features/tables/large-table-with-allignments.md
diff --git a/test/functional/cases/features/tables/large.html b/test/functional/makehtml/cases/features/tables/large.html
similarity index 100%
rename from test/functional/cases/features/tables/large.html
rename to test/functional/makehtml/cases/features/tables/large.html
diff --git a/test/functional/cases/features/tables/large.md b/test/functional/makehtml/cases/features/tables/large.md
similarity index 100%
rename from test/functional/cases/features/tables/large.md
rename to test/functional/makehtml/cases/features/tables/large.md
diff --git a/test/functional/cases/features/tables/mixed-alignment.html b/test/functional/makehtml/cases/features/tables/mixed-alignment.html
similarity index 100%
rename from test/functional/cases/features/tables/mixed-alignment.html
rename to test/functional/makehtml/cases/features/tables/mixed-alignment.html
diff --git a/test/functional/cases/features/tables/mixed-alignment.md b/test/functional/makehtml/cases/features/tables/mixed-alignment.md
similarity index 100%
rename from test/functional/cases/features/tables/mixed-alignment.md
rename to test/functional/makehtml/cases/features/tables/mixed-alignment.md
diff --git a/test/functional/cases/features/tables/multiple-tables.html b/test/functional/makehtml/cases/features/tables/multiple-tables.html
similarity index 100%
rename from test/functional/cases/features/tables/multiple-tables.html
rename to test/functional/makehtml/cases/features/tables/multiple-tables.html
diff --git a/test/functional/cases/features/tables/multiple-tables.md b/test/functional/makehtml/cases/features/tables/multiple-tables.md
similarity index 100%
rename from test/functional/cases/features/tables/multiple-tables.md
rename to test/functional/makehtml/cases/features/tables/multiple-tables.md
diff --git a/test/functional/cases/features/tables/table-inside-codeblock.html b/test/functional/makehtml/cases/features/tables/table-inside-codeblock.html
similarity index 100%
rename from test/functional/cases/features/tables/table-inside-codeblock.html
rename to test/functional/makehtml/cases/features/tables/table-inside-codeblock.html
diff --git a/test/functional/cases/features/tables/table-inside-codeblock.md b/test/functional/makehtml/cases/features/tables/table-inside-codeblock.md
similarity index 100%
rename from test/functional/cases/features/tables/table-inside-codeblock.md
rename to test/functional/makehtml/cases/features/tables/table-inside-codeblock.md
diff --git a/test/functional/cases/features/tables/table-without-leading-pipe.html b/test/functional/makehtml/cases/features/tables/table-without-leading-pipe.html
similarity index 100%
rename from test/functional/cases/features/tables/table-without-leading-pipe.html
rename to test/functional/makehtml/cases/features/tables/table-without-leading-pipe.html
diff --git a/test/functional/cases/features/tables/table-without-leading-pipe.md b/test/functional/makehtml/cases/features/tables/table-without-leading-pipe.md
similarity index 100%
rename from test/functional/cases/features/tables/table-without-leading-pipe.md
rename to test/functional/makehtml/cases/features/tables/table-without-leading-pipe.md
diff --git a/test/functional/cases/features/tables/with-equals.html b/test/functional/makehtml/cases/features/tables/with-equals.html
similarity index 100%
rename from test/functional/cases/features/tables/with-equals.html
rename to test/functional/makehtml/cases/features/tables/with-equals.html
diff --git a/test/functional/cases/features/tables/with-equals.md b/test/functional/makehtml/cases/features/tables/with-equals.md
similarity index 100%
rename from test/functional/cases/features/tables/with-equals.md
rename to test/functional/makehtml/cases/features/tables/with-equals.md
diff --git a/test/functional/cases/features/tables/with-span-elements.html b/test/functional/makehtml/cases/features/tables/with-span-elements.html
similarity index 100%
rename from test/functional/cases/features/tables/with-span-elements.html
rename to test/functional/makehtml/cases/features/tables/with-span-elements.html
diff --git a/test/functional/cases/features/tables/with-span-elements.md b/test/functional/makehtml/cases/features/tables/with-span-elements.md
similarity index 100%
rename from test/functional/cases/features/tables/with-span-elements.md
rename to test/functional/makehtml/cases/features/tables/with-span-elements.md
diff --git a/test/functional/cases/features/tables/with-surroundings.html b/test/functional/makehtml/cases/features/tables/with-surroundings.html
similarity index 100%
rename from test/functional/cases/features/tables/with-surroundings.html
rename to test/functional/makehtml/cases/features/tables/with-surroundings.html
diff --git a/test/functional/cases/features/tables/with-surroundings.md b/test/functional/makehtml/cases/features/tables/with-surroundings.md
similarity index 100%
rename from test/functional/cases/features/tables/with-surroundings.md
rename to test/functional/makehtml/cases/features/tables/with-surroundings.md
diff --git a/test/functional/cases/features/tables/without-body.html b/test/functional/makehtml/cases/features/tables/without-body.html
similarity index 100%
rename from test/functional/cases/features/tables/without-body.html
rename to test/functional/makehtml/cases/features/tables/without-body.html
diff --git a/test/functional/cases/features/tables/without-body.md b/test/functional/makehtml/cases/features/tables/without-body.md
similarity index 100%
rename from test/functional/cases/features/tables/without-body.md
rename to test/functional/makehtml/cases/features/tables/without-body.md
diff --git a/test/functional/cases/features/tables/without-header-delimiter.html b/test/functional/makehtml/cases/features/tables/without-header-delimiter.html
similarity index 100%
rename from test/functional/cases/features/tables/without-header-delimiter.html
rename to test/functional/makehtml/cases/features/tables/without-header-delimiter.html
diff --git a/test/functional/cases/features/tables/without-header-delimiter.md b/test/functional/makehtml/cases/features/tables/without-header-delimiter.md
similarity index 100%
rename from test/functional/cases/features/tables/without-header-delimiter.md
rename to test/functional/makehtml/cases/features/tables/without-header-delimiter.md
diff --git a/test/functional/cases/features/underline/fulltext.html b/test/functional/makehtml/cases/features/underline/fulltext.html
similarity index 100%
rename from test/functional/cases/features/underline/fulltext.html
rename to test/functional/makehtml/cases/features/underline/fulltext.html
diff --git a/test/functional/cases/features/underline/fulltext.md b/test/functional/makehtml/cases/features/underline/fulltext.md
similarity index 100%
rename from test/functional/cases/features/underline/fulltext.md
rename to test/functional/makehtml/cases/features/underline/fulltext.md
diff --git a/test/functional/cases/features/underline/simple.html b/test/functional/makehtml/cases/features/underline/simple.html
similarity index 100%
rename from test/functional/cases/features/underline/simple.html
rename to test/functional/makehtml/cases/features/underline/simple.html
diff --git a/test/functional/cases/features/underline/simple.md b/test/functional/makehtml/cases/features/underline/simple.md
similarity index 100%
rename from test/functional/cases/features/underline/simple.md
rename to test/functional/makehtml/cases/features/underline/simple.md
diff --git a/test/functional/cases/ghost/markdown-magic.html b/test/functional/makehtml/cases/ghost/markdown-magic.html
similarity index 100%
rename from test/functional/cases/ghost/markdown-magic.html
rename to test/functional/makehtml/cases/ghost/markdown-magic.html
diff --git a/test/functional/cases/ghost/markdown-magic.md b/test/functional/makehtml/cases/ghost/markdown-magic.md
similarity index 100%
rename from test/functional/cases/ghost/markdown-magic.md
rename to test/functional/makehtml/cases/ghost/markdown-magic.md
diff --git a/test/functional/cases/ghost/underscore.html b/test/functional/makehtml/cases/ghost/underscore.html
similarity index 100%
rename from test/functional/cases/ghost/underscore.html
rename to test/functional/makehtml/cases/ghost/underscore.html
diff --git a/test/functional/cases/ghost/underscore.md b/test/functional/makehtml/cases/ghost/underscore.md
similarity index 100%
rename from test/functional/cases/ghost/underscore.md
rename to test/functional/makehtml/cases/ghost/underscore.md
diff --git a/test/functional/cases/issues/#107.inner-underscore-parse-to-block.html b/test/functional/makehtml/cases/issues/#107.inner-underscore-parse-to-block.html
similarity index 100%
rename from test/functional/cases/issues/#107.inner-underscore-parse-to-block.html
rename to test/functional/makehtml/cases/issues/#107.inner-underscore-parse-to-block.html
diff --git a/test/functional/cases/issues/#107.inner-underscore-parse-to-block.md b/test/functional/makehtml/cases/issues/#107.inner-underscore-parse-to-block.md
similarity index 100%
rename from test/functional/cases/issues/#107.inner-underscore-parse-to-block.md
rename to test/functional/makehtml/cases/issues/#107.inner-underscore-parse-to-block.md
diff --git a/test/functional/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.html b/test/functional/makehtml/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.html
similarity index 100%
rename from test/functional/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.html
rename to test/functional/makehtml/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.html
diff --git a/test/functional/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.md b/test/functional/makehtml/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.md
similarity index 100%
rename from test/functional/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.md
rename to test/functional/makehtml/cases/issues/#142.odd-behaviour-for-multiple-consecutive-lists.md
diff --git a/test/functional/cases/issues/#150.hyphens-are-getting-removed.html b/test/functional/makehtml/cases/issues/#150.hyphens-are-getting-removed.html
similarity index 100%
rename from test/functional/cases/issues/#150.hyphens-are-getting-removed.html
rename to test/functional/makehtml/cases/issues/#150.hyphens-are-getting-removed.html
diff --git a/test/functional/cases/issues/#150.hyphens-are-getting-removed.md b/test/functional/makehtml/cases/issues/#150.hyphens-are-getting-removed.md
similarity index 100%
rename from test/functional/cases/issues/#150.hyphens-are-getting-removed.md
rename to test/functional/makehtml/cases/issues/#150.hyphens-are-getting-removed.md
diff --git a/test/functional/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.html b/test/functional/makehtml/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.html
similarity index 100%
rename from test/functional/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.html
rename to test/functional/makehtml/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.html
diff --git a/test/functional/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.md b/test/functional/makehtml/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.md
similarity index 100%
rename from test/functional/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.md
rename to test/functional/makehtml/cases/issues/#183.gh-code-blocks-within-lists-do-not-render-properly.md
diff --git a/test/functional/cases/issues/#191.blockquote-followed-by-an-heading.html b/test/functional/makehtml/cases/issues/#191.blockquote-followed-by-an-heading.html
similarity index 100%
rename from test/functional/cases/issues/#191.blockquote-followed-by-an-heading.html
rename to test/functional/makehtml/cases/issues/#191.blockquote-followed-by-an-heading.html
diff --git a/test/functional/cases/issues/#191.blockquote-followed-by-an-heading.md b/test/functional/makehtml/cases/issues/#191.blockquote-followed-by-an-heading.md
similarity index 100%
rename from test/functional/cases/issues/#191.blockquote-followed-by-an-heading.md
rename to test/functional/makehtml/cases/issues/#191.blockquote-followed-by-an-heading.md
diff --git a/test/functional/cases/issues/#196.entity-in-code-block-in-nested-list.html b/test/functional/makehtml/cases/issues/#196.entity-in-code-block-in-nested-list.html
similarity index 100%
rename from test/functional/cases/issues/#196.entity-in-code-block-in-nested-list.html
rename to test/functional/makehtml/cases/issues/#196.entity-in-code-block-in-nested-list.html
diff --git a/test/functional/cases/issues/#196.entity-in-code-block-in-nested-list.md b/test/functional/makehtml/cases/issues/#196.entity-in-code-block-in-nested-list.md
similarity index 100%
rename from test/functional/cases/issues/#196.entity-in-code-block-in-nested-list.md
rename to test/functional/makehtml/cases/issues/#196.entity-in-code-block-in-nested-list.md
diff --git a/test/functional/cases/issues/#220.html-breaks-markdown-parsing.html b/test/functional/makehtml/cases/issues/#220.html-breaks-markdown-parsing.html
similarity index 100%
rename from test/functional/cases/issues/#220.html-breaks-markdown-parsing.html
rename to test/functional/makehtml/cases/issues/#220.html-breaks-markdown-parsing.html
diff --git a/test/functional/cases/issues/#220.html-breaks-markdown-parsing.md b/test/functional/makehtml/cases/issues/#220.html-breaks-markdown-parsing.md
similarity index 100%
rename from test/functional/cases/issues/#220.html-breaks-markdown-parsing.md
rename to test/functional/makehtml/cases/issues/#220.html-breaks-markdown-parsing.md
diff --git a/test/functional/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html b/test/functional/makehtml/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html
similarity index 100%
rename from test/functional/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html
rename to test/functional/makehtml/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html
diff --git a/test/functional/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.md b/test/functional/makehtml/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.md
similarity index 100%
rename from test/functional/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.md
rename to test/functional/makehtml/cases/issues/#229.2.code-being-parsed-inside-HTML-code-tags.md
diff --git a/test/functional/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.html b/test/functional/makehtml/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.html
similarity index 100%
rename from test/functional/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.html
rename to test/functional/makehtml/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.html
diff --git a/test/functional/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.md b/test/functional/makehtml/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.md
similarity index 100%
rename from test/functional/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.md
rename to test/functional/makehtml/cases/issues/#229.code-being-parsed-inside-HTML-code-tags.md
diff --git a/test/functional/cases/issues/#230.paragraphs-are-ignored-between-code-tags.html b/test/functional/makehtml/cases/issues/#230.paragraphs-are-ignored-between-code-tags.html
similarity index 100%
rename from test/functional/cases/issues/#230.paragraphs-are-ignored-between-code-tags.html
rename to test/functional/makehtml/cases/issues/#230.paragraphs-are-ignored-between-code-tags.html
diff --git a/test/functional/cases/issues/#230.paragraphs-are-ignored-between-code-tags.md b/test/functional/makehtml/cases/issues/#230.paragraphs-are-ignored-between-code-tags.md
similarity index 100%
rename from test/functional/cases/issues/#230.paragraphs-are-ignored-between-code-tags.md
rename to test/functional/makehtml/cases/issues/#230.paragraphs-are-ignored-between-code-tags.md
diff --git a/test/functional/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.html b/test/functional/makehtml/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.html
similarity index 100%
rename from test/functional/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.html
rename to test/functional/makehtml/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.html
diff --git a/test/functional/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.md b/test/functional/makehtml/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.md
similarity index 100%
rename from test/functional/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.md
rename to test/functional/makehtml/cases/issues/#236.wrong-lt-parsing-when-attached-to-word.md
diff --git a/test/functional/cases/issues/#261.mix-images-with-links.html b/test/functional/makehtml/cases/issues/#261.mix-images-with-links.html
similarity index 100%
rename from test/functional/cases/issues/#261.mix-images-with-links.html
rename to test/functional/makehtml/cases/issues/#261.mix-images-with-links.html
diff --git a/test/functional/cases/issues/#261.mix-images-with-links.md b/test/functional/makehtml/cases/issues/#261.mix-images-with-links.md
similarity index 100%
rename from test/functional/cases/issues/#261.mix-images-with-links.md
rename to test/functional/makehtml/cases/issues/#261.mix-images-with-links.md
diff --git a/test/functional/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.html b/test/functional/makehtml/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.html
similarity index 100%
rename from test/functional/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.html
rename to test/functional/makehtml/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.html
diff --git a/test/functional/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.md b/test/functional/makehtml/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.md
similarity index 100%
rename from test/functional/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.md
rename to test/functional/makehtml/cases/issues/#261.reference-style-image-after-inline-style-image-does-not-work-correctely.md
diff --git a/test/functional/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.html b/test/functional/makehtml/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.html
similarity index 100%
rename from test/functional/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.html
rename to test/functional/makehtml/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.html
diff --git a/test/functional/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.md b/test/functional/makehtml/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.md
similarity index 100%
rename from test/functional/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.md
rename to test/functional/makehtml/cases/issues/#261.reference-style-link-after-inline-style-link-does-not-work-correctely.md
diff --git a/test/functional/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.html b/test/functional/makehtml/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.html
similarity index 100%
rename from test/functional/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.html
rename to test/functional/makehtml/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.html
diff --git a/test/functional/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.md b/test/functional/makehtml/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.md
similarity index 100%
rename from test/functional/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.md
rename to test/functional/makehtml/cases/issues/#288.code-blocks-containing-xml-comments-are-not-converted-correctly-when-nested-in-list-items.md
diff --git a/test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.html b/test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.html
similarity index 100%
rename from test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.html
rename to test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.html
diff --git a/test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.md b/test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.md
similarity index 100%
rename from test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.md
rename to test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-2.md
diff --git a/test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.html b/test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.html
similarity index 100%
rename from test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.html
rename to test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.html
diff --git a/test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.md b/test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.md
similarity index 100%
rename from test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.md
rename to test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior-3.md
diff --git a/test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html b/test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html
similarity index 100%
rename from test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html
rename to test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html
diff --git a/test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md b/test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md
similarity index 100%
rename from test/functional/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md
rename to test/functional/makehtml/cases/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char.html b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char.html
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char.html
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char.html
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char.md b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char.md
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char.md
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char.md
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char2.html b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char2.html
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char2.html
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char2.html
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char2.md b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char2.md
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char2.md
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char2.md
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char3.html b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char3.html
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char3.html
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char3.html
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char3.md b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char3.md
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char3.md
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char3.md
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char4.html b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char4.html
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char4.html
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char4.html
diff --git a/test/functional/cases/issues/#312.spaced-dashes-followed-by-char4.md b/test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char4.md
similarity index 100%
rename from test/functional/cases/issues/#312.spaced-dashes-followed-by-char4.md
rename to test/functional/makehtml/cases/issues/#312.spaced-dashes-followed-by-char4.md
diff --git a/test/functional/cases/issues/#317.spaces-before-hr.html b/test/functional/makehtml/cases/issues/#317.spaces-before-hr.html
similarity index 100%
rename from test/functional/cases/issues/#317.spaces-before-hr.html
rename to test/functional/makehtml/cases/issues/#317.spaces-before-hr.html
diff --git a/test/functional/cases/issues/#317.spaces-before-hr.md b/test/functional/makehtml/cases/issues/#317.spaces-before-hr.md
similarity index 100%
rename from test/functional/cases/issues/#317.spaces-before-hr.md
rename to test/functional/makehtml/cases/issues/#317.spaces-before-hr.md
diff --git a/test/functional/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.html b/test/functional/makehtml/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.html
similarity index 100%
rename from test/functional/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.html
rename to test/functional/makehtml/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.html
diff --git a/test/functional/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.md b/test/functional/makehtml/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.md
similarity index 100%
rename from test/functional/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.md
rename to test/functional/makehtml/cases/issues/#332.inconsistent-behavior-of-emphasis-and-strong.md
diff --git a/test/functional/cases/issues/#345.no-escape-for-the-pipe-character.html b/test/functional/makehtml/cases/issues/#345.no-escape-for-the-pipe-character.html
similarity index 100%
rename from test/functional/cases/issues/#345.no-escape-for-the-pipe-character.html
rename to test/functional/makehtml/cases/issues/#345.no-escape-for-the-pipe-character.html
diff --git a/test/functional/cases/issues/#345.no-escape-for-the-pipe-character.md b/test/functional/makehtml/cases/issues/#345.no-escape-for-the-pipe-character.md
similarity index 100%
rename from test/functional/cases/issues/#345.no-escape-for-the-pipe-character.md
rename to test/functional/makehtml/cases/issues/#345.no-escape-for-the-pipe-character.md
diff --git a/test/functional/cases/issues/#390.brackets-in-URL-break-images.html b/test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-images.html
similarity index 100%
rename from test/functional/cases/issues/#390.brackets-in-URL-break-images.html
rename to test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-images.html
diff --git a/test/functional/cases/issues/#390.brackets-in-URL-break-images.md b/test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-images.md
similarity index 100%
rename from test/functional/cases/issues/#390.brackets-in-URL-break-images.md
rename to test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-images.md
diff --git a/test/functional/cases/issues/#390.brackets-in-URL-break-links.html b/test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-links.html
similarity index 100%
rename from test/functional/cases/issues/#390.brackets-in-URL-break-links.html
rename to test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-links.html
diff --git a/test/functional/cases/issues/#390.brackets-in-URL-break-links.md b/test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-links.md
similarity index 100%
rename from test/functional/cases/issues/#390.brackets-in-URL-break-links.md
rename to test/functional/makehtml/cases/issues/#390.brackets-in-URL-break-links.md
diff --git a/test/functional/cases/issues/#393.showdown-hangs-with-malformed-html.html b/test/functional/makehtml/cases/issues/#393.showdown-hangs-with-malformed-html.html
similarity index 100%
rename from test/functional/cases/issues/#393.showdown-hangs-with-malformed-html.html
rename to test/functional/makehtml/cases/issues/#393.showdown-hangs-with-malformed-html.html
diff --git a/test/functional/cases/issues/#393.showdown-hangs-with-malformed-html.md b/test/functional/makehtml/cases/issues/#393.showdown-hangs-with-malformed-html.md
similarity index 100%
rename from test/functional/cases/issues/#393.showdown-hangs-with-malformed-html.md
rename to test/functional/makehtml/cases/issues/#393.showdown-hangs-with-malformed-html.md
diff --git a/test/functional/cases/issues/#397.unordered-list-strange-behavior.html b/test/functional/makehtml/cases/issues/#397.unordered-list-strange-behavior.html
similarity index 100%
rename from test/functional/cases/issues/#397.unordered-list-strange-behavior.html
rename to test/functional/makehtml/cases/issues/#397.unordered-list-strange-behavior.html
diff --git a/test/functional/cases/issues/#397.unordered-list-strange-behavior.md b/test/functional/makehtml/cases/issues/#397.unordered-list-strange-behavior.md
similarity index 100%
rename from test/functional/cases/issues/#397.unordered-list-strange-behavior.md
rename to test/functional/makehtml/cases/issues/#397.unordered-list-strange-behavior.md
diff --git a/test/functional/cases/issues/#429.multiline-base64-image-support.html b/test/functional/makehtml/cases/issues/#429.multiline-base64-image-support.html
similarity index 100%
rename from test/functional/cases/issues/#429.multiline-base64-image-support.html
rename to test/functional/makehtml/cases/issues/#429.multiline-base64-image-support.html
diff --git a/test/functional/cases/issues/#429.multiline-base64-image-support.md b/test/functional/makehtml/cases/issues/#429.multiline-base64-image-support.md
similarity index 100%
rename from test/functional/cases/issues/#429.multiline-base64-image-support.md
rename to test/functional/makehtml/cases/issues/#429.multiline-base64-image-support.md
diff --git a/test/functional/cases/issues/#467.header-ids-for-subheadings.html b/test/functional/makehtml/cases/issues/#467.header-ids-for-subheadings.html
similarity index 100%
rename from test/functional/cases/issues/#467.header-ids-for-subheadings.html
rename to test/functional/makehtml/cases/issues/#467.header-ids-for-subheadings.html
diff --git a/test/functional/cases/issues/#467.header-ids-for-subheadings.md b/test/functional/makehtml/cases/issues/#467.header-ids-for-subheadings.md
similarity index 100%
rename from test/functional/cases/issues/#467.header-ids-for-subheadings.md
rename to test/functional/makehtml/cases/issues/#467.header-ids-for-subheadings.md
diff --git a/test/functional/cases/issues/#83.parsed-text-links-with-underscores.html b/test/functional/makehtml/cases/issues/#83.parsed-text-links-with-underscores.html
similarity index 100%
rename from test/functional/cases/issues/#83.parsed-text-links-with-underscores.html
rename to test/functional/makehtml/cases/issues/#83.parsed-text-links-with-underscores.html
diff --git a/test/functional/cases/issues/#83.parsed-text-links-with-underscores.md b/test/functional/makehtml/cases/issues/#83.parsed-text-links-with-underscores.md
similarity index 100%
rename from test/functional/cases/issues/#83.parsed-text-links-with-underscores.md
rename to test/functional/makehtml/cases/issues/#83.parsed-text-links-with-underscores.md
diff --git a/test/functional/cases/issues/#96.underscores-in-links.html b/test/functional/makehtml/cases/issues/#96.underscores-in-links.html
similarity index 100%
rename from test/functional/cases/issues/#96.underscores-in-links.html
rename to test/functional/makehtml/cases/issues/#96.underscores-in-links.html
diff --git a/test/functional/cases/issues/#96.underscores-in-links.md b/test/functional/makehtml/cases/issues/#96.underscores-in-links.md
similarity index 100%
rename from test/functional/cases/issues/#96.underscores-in-links.md
rename to test/functional/makehtml/cases/issues/#96.underscores-in-links.md
diff --git a/test/functional/cases/issues/URLs-with-multiple-parenthesis.html b/test/functional/makehtml/cases/issues/URLs-with-multiple-parenthesis.html
similarity index 100%
rename from test/functional/cases/issues/URLs-with-multiple-parenthesis.html
rename to test/functional/makehtml/cases/issues/URLs-with-multiple-parenthesis.html
diff --git a/test/functional/cases/issues/URLs-with-multiple-parenthesis.md b/test/functional/makehtml/cases/issues/URLs-with-multiple-parenthesis.md
similarity index 100%
rename from test/functional/cases/issues/URLs-with-multiple-parenthesis.md
rename to test/functional/makehtml/cases/issues/URLs-with-multiple-parenthesis.md
diff --git a/test/functional/cases/issues/crazy-urls.html b/test/functional/makehtml/cases/issues/crazy-urls.html
similarity index 100%
rename from test/functional/cases/issues/crazy-urls.html
rename to test/functional/makehtml/cases/issues/crazy-urls.html
diff --git a/test/functional/cases/issues/crazy-urls.md b/test/functional/makehtml/cases/issues/crazy-urls.md
similarity index 100%
rename from test/functional/cases/issues/crazy-urls.md
rename to test/functional/makehtml/cases/issues/crazy-urls.md
diff --git a/test/functional/cases/issues/deeply-nested-HTML-blocks.html b/test/functional/makehtml/cases/issues/deeply-nested-HTML-blocks.html
similarity index 100%
rename from test/functional/cases/issues/deeply-nested-HTML-blocks.html
rename to test/functional/makehtml/cases/issues/deeply-nested-HTML-blocks.html
diff --git a/test/functional/cases/issues/deeply-nested-HTML-blocks.md b/test/functional/makehtml/cases/issues/deeply-nested-HTML-blocks.md
similarity index 100%
rename from test/functional/cases/issues/deeply-nested-HTML-blocks.md
rename to test/functional/makehtml/cases/issues/deeply-nested-HTML-blocks.md
diff --git a/test/functional/cases/issues/handle-html-pre.html b/test/functional/makehtml/cases/issues/handle-html-pre.html
similarity index 100%
rename from test/functional/cases/issues/handle-html-pre.html
rename to test/functional/makehtml/cases/issues/handle-html-pre.html
diff --git a/test/functional/cases/issues/handle-html-pre.md b/test/functional/makehtml/cases/issues/handle-html-pre.md
similarity index 100%
rename from test/functional/cases/issues/handle-html-pre.md
rename to test/functional/makehtml/cases/issues/handle-html-pre.md
diff --git a/test/functional/cases/issues/one-line-HTML-input.html b/test/functional/makehtml/cases/issues/one-line-HTML-input.html
similarity index 100%
rename from test/functional/cases/issues/one-line-HTML-input.html
rename to test/functional/makehtml/cases/issues/one-line-HTML-input.html
diff --git a/test/functional/cases/issues/one-line-HTML-input.md b/test/functional/makehtml/cases/issues/one-line-HTML-input.md
similarity index 100%
rename from test/functional/cases/issues/one-line-HTML-input.md
rename to test/functional/makehtml/cases/issues/one-line-HTML-input.md
diff --git a/test/functional/cases/karlcow/2-paragraphs-hard-return-spaces.html b/test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-hard-return-spaces.html
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return-spaces.html
diff --git a/test/functional/cases/karlcow/2-paragraphs-hard-return-spaces.md b/test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-hard-return-spaces.md
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return-spaces.md
diff --git a/test/functional/cases/karlcow/2-paragraphs-hard-return.html b/test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return.html
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-hard-return.html
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return.html
diff --git a/test/functional/cases/karlcow/2-paragraphs-hard-return.md b/test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return.md
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-hard-return.md
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-hard-return.md
diff --git a/test/functional/cases/karlcow/2-paragraphs-line-returns.html b/test/functional/makehtml/cases/karlcow/2-paragraphs-line-returns.html
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line-returns.html
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line-returns.html
diff --git a/test/functional/cases/karlcow/2-paragraphs-line-returns.md b/test/functional/makehtml/cases/karlcow/2-paragraphs-line-returns.md
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line-returns.md
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line-returns.md
diff --git a/test/functional/cases/karlcow/2-paragraphs-line-spaces.html b/test/functional/makehtml/cases/karlcow/2-paragraphs-line-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line-spaces.html
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line-spaces.html
diff --git a/test/functional/cases/karlcow/2-paragraphs-line-spaces.md b/test/functional/makehtml/cases/karlcow/2-paragraphs-line-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line-spaces.md
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line-spaces.md
diff --git a/test/functional/cases/karlcow/2-paragraphs-line-tab.html b/test/functional/makehtml/cases/karlcow/2-paragraphs-line-tab.html
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line-tab.html
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line-tab.html
diff --git a/test/functional/cases/karlcow/2-paragraphs-line-tab.md b/test/functional/makehtml/cases/karlcow/2-paragraphs-line-tab.md
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line-tab.md
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line-tab.md
diff --git a/test/functional/cases/karlcow/2-paragraphs-line.html b/test/functional/makehtml/cases/karlcow/2-paragraphs-line.html
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line.html
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line.html
diff --git a/test/functional/cases/karlcow/2-paragraphs-line.md b/test/functional/makehtml/cases/karlcow/2-paragraphs-line.md
similarity index 100%
rename from test/functional/cases/karlcow/2-paragraphs-line.md
rename to test/functional/makehtml/cases/karlcow/2-paragraphs-line.md
diff --git a/test/functional/cases/karlcow/EOL-CR+LF.html b/test/functional/makehtml/cases/karlcow/EOL-CR+LF.html
similarity index 100%
rename from test/functional/cases/karlcow/EOL-CR+LF.html
rename to test/functional/makehtml/cases/karlcow/EOL-CR+LF.html
diff --git a/test/functional/cases/karlcow/EOL-CR+LF.md b/test/functional/makehtml/cases/karlcow/EOL-CR+LF.md
similarity index 100%
rename from test/functional/cases/karlcow/EOL-CR+LF.md
rename to test/functional/makehtml/cases/karlcow/EOL-CR+LF.md
diff --git a/test/functional/cases/karlcow/EOL-CR.html b/test/functional/makehtml/cases/karlcow/EOL-CR.html
similarity index 100%
rename from test/functional/cases/karlcow/EOL-CR.html
rename to test/functional/makehtml/cases/karlcow/EOL-CR.html
diff --git a/test/functional/cases/karlcow/EOL-CR.md b/test/functional/makehtml/cases/karlcow/EOL-CR.md
similarity index 100%
rename from test/functional/cases/karlcow/EOL-CR.md
rename to test/functional/makehtml/cases/karlcow/EOL-CR.md
diff --git a/test/functional/cases/karlcow/EOL-LF.html b/test/functional/makehtml/cases/karlcow/EOL-LF.html
similarity index 100%
rename from test/functional/cases/karlcow/EOL-LF.html
rename to test/functional/makehtml/cases/karlcow/EOL-LF.html
diff --git a/test/functional/cases/karlcow/EOL-LF.md b/test/functional/makehtml/cases/karlcow/EOL-LF.md
similarity index 100%
rename from test/functional/cases/karlcow/EOL-LF.md
rename to test/functional/makehtml/cases/karlcow/EOL-LF.md
diff --git a/test/functional/cases/karlcow/ampersand-text-flow.html b/test/functional/makehtml/cases/karlcow/ampersand-text-flow.html
similarity index 100%
rename from test/functional/cases/karlcow/ampersand-text-flow.html
rename to test/functional/makehtml/cases/karlcow/ampersand-text-flow.html
diff --git a/test/functional/cases/karlcow/ampersand-text-flow.md b/test/functional/makehtml/cases/karlcow/ampersand-text-flow.md
similarity index 100%
rename from test/functional/cases/karlcow/ampersand-text-flow.md
rename to test/functional/makehtml/cases/karlcow/ampersand-text-flow.md
diff --git a/test/functional/cases/karlcow/ampersand-uri.html b/test/functional/makehtml/cases/karlcow/ampersand-uri.html
similarity index 100%
rename from test/functional/cases/karlcow/ampersand-uri.html
rename to test/functional/makehtml/cases/karlcow/ampersand-uri.html
diff --git a/test/functional/cases/karlcow/ampersand-uri.md b/test/functional/makehtml/cases/karlcow/ampersand-uri.md
similarity index 100%
rename from test/functional/cases/karlcow/ampersand-uri.md
rename to test/functional/makehtml/cases/karlcow/ampersand-uri.md
diff --git a/test/functional/cases/karlcow/asterisk-near-text.html b/test/functional/makehtml/cases/karlcow/asterisk-near-text.html
similarity index 100%
rename from test/functional/cases/karlcow/asterisk-near-text.html
rename to test/functional/makehtml/cases/karlcow/asterisk-near-text.html
diff --git a/test/functional/cases/karlcow/asterisk-near-text.md b/test/functional/makehtml/cases/karlcow/asterisk-near-text.md
similarity index 100%
rename from test/functional/cases/karlcow/asterisk-near-text.md
rename to test/functional/makehtml/cases/karlcow/asterisk-near-text.md
diff --git a/test/functional/cases/karlcow/asterisk.html b/test/functional/makehtml/cases/karlcow/asterisk.html
similarity index 100%
rename from test/functional/cases/karlcow/asterisk.html
rename to test/functional/makehtml/cases/karlcow/asterisk.html
diff --git a/test/functional/cases/karlcow/asterisk.md b/test/functional/makehtml/cases/karlcow/asterisk.md
similarity index 100%
rename from test/functional/cases/karlcow/asterisk.md
rename to test/functional/makehtml/cases/karlcow/asterisk.md
diff --git a/test/functional/cases/karlcow/backslash-escape.html b/test/functional/makehtml/cases/karlcow/backslash-escape.html
similarity index 100%
rename from test/functional/cases/karlcow/backslash-escape.html
rename to test/functional/makehtml/cases/karlcow/backslash-escape.html
diff --git a/test/functional/cases/karlcow/backslash-escape.md b/test/functional/makehtml/cases/karlcow/backslash-escape.md
similarity index 100%
rename from test/functional/cases/karlcow/backslash-escape.md
rename to test/functional/makehtml/cases/karlcow/backslash-escape.md
diff --git a/test/functional/cases/karlcow/blockquote-added-markup.html b/test/functional/makehtml/cases/karlcow/blockquote-added-markup.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-added-markup.html
rename to test/functional/makehtml/cases/karlcow/blockquote-added-markup.html
diff --git a/test/functional/cases/karlcow/blockquote-added-markup.md b/test/functional/makehtml/cases/karlcow/blockquote-added-markup.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-added-markup.md
rename to test/functional/makehtml/cases/karlcow/blockquote-added-markup.md
diff --git a/test/functional/cases/karlcow/blockquote-line-2-paragraphs.html b/test/functional/makehtml/cases/karlcow/blockquote-line-2-paragraphs.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-line-2-paragraphs.html
rename to test/functional/makehtml/cases/karlcow/blockquote-line-2-paragraphs.html
diff --git a/test/functional/cases/karlcow/blockquote-line-2-paragraphs.md b/test/functional/makehtml/cases/karlcow/blockquote-line-2-paragraphs.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-line-2-paragraphs.md
rename to test/functional/makehtml/cases/karlcow/blockquote-line-2-paragraphs.md
diff --git a/test/functional/cases/karlcow/blockquote-line.html b/test/functional/makehtml/cases/karlcow/blockquote-line.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-line.html
rename to test/functional/makehtml/cases/karlcow/blockquote-line.html
diff --git a/test/functional/cases/karlcow/blockquote-line.md b/test/functional/makehtml/cases/karlcow/blockquote-line.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-line.md
rename to test/functional/makehtml/cases/karlcow/blockquote-line.md
diff --git a/test/functional/cases/karlcow/blockquote-multiline-1-space-begin.html b/test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-begin.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline-1-space-begin.html
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-begin.html
diff --git a/test/functional/cases/karlcow/blockquote-multiline-1-space-begin.md b/test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-begin.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline-1-space-begin.md
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-begin.md
diff --git a/test/functional/cases/karlcow/blockquote-multiline-1-space-end.html b/test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-end.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline-1-space-end.html
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-end.html
diff --git a/test/functional/cases/karlcow/blockquote-multiline-1-space-end.md b/test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-end.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline-1-space-end.md
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline-1-space-end.md
diff --git a/test/functional/cases/karlcow/blockquote-multiline-2-paragraphs.html b/test/functional/makehtml/cases/karlcow/blockquote-multiline-2-paragraphs.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline-2-paragraphs.html
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline-2-paragraphs.html
diff --git a/test/functional/cases/karlcow/blockquote-multiline-2-paragraphs.md b/test/functional/makehtml/cases/karlcow/blockquote-multiline-2-paragraphs.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline-2-paragraphs.md
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline-2-paragraphs.md
diff --git a/test/functional/cases/karlcow/blockquote-multiline.html b/test/functional/makehtml/cases/karlcow/blockquote-multiline.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline.html
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline.html
diff --git a/test/functional/cases/karlcow/blockquote-multiline.md b/test/functional/makehtml/cases/karlcow/blockquote-multiline.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-multiline.md
rename to test/functional/makehtml/cases/karlcow/blockquote-multiline.md
diff --git a/test/functional/cases/karlcow/blockquote-nested-multiplereturn-level1.html b/test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn-level1.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested-multiplereturn-level1.html
rename to test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn-level1.html
diff --git a/test/functional/cases/karlcow/blockquote-nested-multiplereturn-level1.md b/test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn-level1.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested-multiplereturn-level1.md
rename to test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn-level1.md
diff --git a/test/functional/cases/karlcow/blockquote-nested-multiplereturn.html b/test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested-multiplereturn.html
rename to test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn.html
diff --git a/test/functional/cases/karlcow/blockquote-nested-multiplereturn.md b/test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested-multiplereturn.md
rename to test/functional/makehtml/cases/karlcow/blockquote-nested-multiplereturn.md
diff --git a/test/functional/cases/karlcow/blockquote-nested-return-level1.html b/test/functional/makehtml/cases/karlcow/blockquote-nested-return-level1.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested-return-level1.html
rename to test/functional/makehtml/cases/karlcow/blockquote-nested-return-level1.html
diff --git a/test/functional/cases/karlcow/blockquote-nested-return-level1.md b/test/functional/makehtml/cases/karlcow/blockquote-nested-return-level1.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested-return-level1.md
rename to test/functional/makehtml/cases/karlcow/blockquote-nested-return-level1.md
diff --git a/test/functional/cases/karlcow/blockquote-nested.html b/test/functional/makehtml/cases/karlcow/blockquote-nested.html
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested.html
rename to test/functional/makehtml/cases/karlcow/blockquote-nested.html
diff --git a/test/functional/cases/karlcow/blockquote-nested.md b/test/functional/makehtml/cases/karlcow/blockquote-nested.md
similarity index 100%
rename from test/functional/cases/karlcow/blockquote-nested.md
rename to test/functional/makehtml/cases/karlcow/blockquote-nested.md
diff --git a/test/functional/cases/karlcow/code-1-tab.html b/test/functional/makehtml/cases/karlcow/code-1-tab.html
similarity index 100%
rename from test/functional/cases/karlcow/code-1-tab.html
rename to test/functional/makehtml/cases/karlcow/code-1-tab.html
diff --git a/test/functional/cases/karlcow/code-1-tab.md b/test/functional/makehtml/cases/karlcow/code-1-tab.md
similarity index 100%
rename from test/functional/cases/karlcow/code-1-tab.md
rename to test/functional/makehtml/cases/karlcow/code-1-tab.md
diff --git a/test/functional/cases/karlcow/code-4-spaces-escaping.html b/test/functional/makehtml/cases/karlcow/code-4-spaces-escaping.html
similarity index 100%
rename from test/functional/cases/karlcow/code-4-spaces-escaping.html
rename to test/functional/makehtml/cases/karlcow/code-4-spaces-escaping.html
diff --git a/test/functional/cases/karlcow/code-4-spaces-escaping.md b/test/functional/makehtml/cases/karlcow/code-4-spaces-escaping.md
similarity index 100%
rename from test/functional/cases/karlcow/code-4-spaces-escaping.md
rename to test/functional/makehtml/cases/karlcow/code-4-spaces-escaping.md
diff --git a/test/functional/cases/karlcow/code-4-spaces.html b/test/functional/makehtml/cases/karlcow/code-4-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/code-4-spaces.html
rename to test/functional/makehtml/cases/karlcow/code-4-spaces.html
diff --git a/test/functional/cases/karlcow/code-4-spaces.md b/test/functional/makehtml/cases/karlcow/code-4-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/code-4-spaces.md
rename to test/functional/makehtml/cases/karlcow/code-4-spaces.md
diff --git a/test/functional/cases/karlcow/em-middle-word.html b/test/functional/makehtml/cases/karlcow/em-middle-word.html
similarity index 100%
rename from test/functional/cases/karlcow/em-middle-word.html
rename to test/functional/makehtml/cases/karlcow/em-middle-word.html
diff --git a/test/functional/cases/karlcow/em-middle-word.md b/test/functional/makehtml/cases/karlcow/em-middle-word.md
similarity index 100%
rename from test/functional/cases/karlcow/em-middle-word.md
rename to test/functional/makehtml/cases/karlcow/em-middle-word.md
diff --git a/test/functional/cases/karlcow/em-star.html b/test/functional/makehtml/cases/karlcow/em-star.html
similarity index 100%
rename from test/functional/cases/karlcow/em-star.html
rename to test/functional/makehtml/cases/karlcow/em-star.html
diff --git a/test/functional/cases/karlcow/em-star.md b/test/functional/makehtml/cases/karlcow/em-star.md
similarity index 100%
rename from test/functional/cases/karlcow/em-star.md
rename to test/functional/makehtml/cases/karlcow/em-star.md
diff --git a/test/functional/cases/karlcow/em-underscore.html b/test/functional/makehtml/cases/karlcow/em-underscore.html
similarity index 100%
rename from test/functional/cases/karlcow/em-underscore.html
rename to test/functional/makehtml/cases/karlcow/em-underscore.html
diff --git a/test/functional/cases/karlcow/em-underscore.md b/test/functional/makehtml/cases/karlcow/em-underscore.md
similarity index 100%
rename from test/functional/cases/karlcow/em-underscore.md
rename to test/functional/makehtml/cases/karlcow/em-underscore.md
diff --git a/test/functional/cases/karlcow/entities-text-flow.html b/test/functional/makehtml/cases/karlcow/entities-text-flow.html
similarity index 100%
rename from test/functional/cases/karlcow/entities-text-flow.html
rename to test/functional/makehtml/cases/karlcow/entities-text-flow.html
diff --git a/test/functional/cases/karlcow/entities-text-flow.md b/test/functional/makehtml/cases/karlcow/entities-text-flow.md
similarity index 100%
rename from test/functional/cases/karlcow/entities-text-flow.md
rename to test/functional/makehtml/cases/karlcow/entities-text-flow.md
diff --git a/test/functional/cases/karlcow/header-level1-equal-underlined.html b/test/functional/makehtml/cases/karlcow/header-level1-equal-underlined.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-equal-underlined.html
rename to test/functional/makehtml/cases/karlcow/header-level1-equal-underlined.html
diff --git a/test/functional/cases/karlcow/header-level1-equal-underlined.md b/test/functional/makehtml/cases/karlcow/header-level1-equal-underlined.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-equal-underlined.md
rename to test/functional/makehtml/cases/karlcow/header-level1-equal-underlined.md
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign-closed.html b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign-closed.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign-closed.html
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign-closed.html
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign-closed.md b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign-closed.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign-closed.md
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign-closed.md
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign-trailing-1-space.html b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-1-space.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign-trailing-1-space.html
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-1-space.html
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign-trailing-1-space.md b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-1-space.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign-trailing-1-space.md
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-1-space.md
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.html b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.html
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.html
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.md b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.md
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign-trailing-2-spaces.md
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign.html b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign.html
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign.html
diff --git a/test/functional/cases/karlcow/header-level1-hash-sign.md b/test/functional/makehtml/cases/karlcow/header-level1-hash-sign.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level1-hash-sign.md
rename to test/functional/makehtml/cases/karlcow/header-level1-hash-sign.md
diff --git a/test/functional/cases/karlcow/header-level2-dash-underlined.html b/test/functional/makehtml/cases/karlcow/header-level2-dash-underlined.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level2-dash-underlined.html
rename to test/functional/makehtml/cases/karlcow/header-level2-dash-underlined.html
diff --git a/test/functional/cases/karlcow/header-level2-dash-underlined.md b/test/functional/makehtml/cases/karlcow/header-level2-dash-underlined.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level2-dash-underlined.md
rename to test/functional/makehtml/cases/karlcow/header-level2-dash-underlined.md
diff --git a/test/functional/cases/karlcow/header-level2-hash-sign-closed.html b/test/functional/makehtml/cases/karlcow/header-level2-hash-sign-closed.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level2-hash-sign-closed.html
rename to test/functional/makehtml/cases/karlcow/header-level2-hash-sign-closed.html
diff --git a/test/functional/cases/karlcow/header-level2-hash-sign-closed.md b/test/functional/makehtml/cases/karlcow/header-level2-hash-sign-closed.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level2-hash-sign-closed.md
rename to test/functional/makehtml/cases/karlcow/header-level2-hash-sign-closed.md
diff --git a/test/functional/cases/karlcow/header-level2-hash-sign.html b/test/functional/makehtml/cases/karlcow/header-level2-hash-sign.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level2-hash-sign.html
rename to test/functional/makehtml/cases/karlcow/header-level2-hash-sign.html
diff --git a/test/functional/cases/karlcow/header-level2-hash-sign.md b/test/functional/makehtml/cases/karlcow/header-level2-hash-sign.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level2-hash-sign.md
rename to test/functional/makehtml/cases/karlcow/header-level2-hash-sign.md
diff --git a/test/functional/cases/karlcow/header-level3-hash-sign-closed.html b/test/functional/makehtml/cases/karlcow/header-level3-hash-sign-closed.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level3-hash-sign-closed.html
rename to test/functional/makehtml/cases/karlcow/header-level3-hash-sign-closed.html
diff --git a/test/functional/cases/karlcow/header-level3-hash-sign-closed.md b/test/functional/makehtml/cases/karlcow/header-level3-hash-sign-closed.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level3-hash-sign-closed.md
rename to test/functional/makehtml/cases/karlcow/header-level3-hash-sign-closed.md
diff --git a/test/functional/cases/karlcow/header-level3-hash-sign.html b/test/functional/makehtml/cases/karlcow/header-level3-hash-sign.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level3-hash-sign.html
rename to test/functional/makehtml/cases/karlcow/header-level3-hash-sign.html
diff --git a/test/functional/cases/karlcow/header-level3-hash-sign.md b/test/functional/makehtml/cases/karlcow/header-level3-hash-sign.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level3-hash-sign.md
rename to test/functional/makehtml/cases/karlcow/header-level3-hash-sign.md
diff --git a/test/functional/cases/karlcow/header-level4-hash-sign-closed.html b/test/functional/makehtml/cases/karlcow/header-level4-hash-sign-closed.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level4-hash-sign-closed.html
rename to test/functional/makehtml/cases/karlcow/header-level4-hash-sign-closed.html
diff --git a/test/functional/cases/karlcow/header-level4-hash-sign-closed.md b/test/functional/makehtml/cases/karlcow/header-level4-hash-sign-closed.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level4-hash-sign-closed.md
rename to test/functional/makehtml/cases/karlcow/header-level4-hash-sign-closed.md
diff --git a/test/functional/cases/karlcow/header-level4-hash-sign.html b/test/functional/makehtml/cases/karlcow/header-level4-hash-sign.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level4-hash-sign.html
rename to test/functional/makehtml/cases/karlcow/header-level4-hash-sign.html
diff --git a/test/functional/cases/karlcow/header-level4-hash-sign.md b/test/functional/makehtml/cases/karlcow/header-level4-hash-sign.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level4-hash-sign.md
rename to test/functional/makehtml/cases/karlcow/header-level4-hash-sign.md
diff --git a/test/functional/cases/karlcow/header-level5-hash-sign-closed.html b/test/functional/makehtml/cases/karlcow/header-level5-hash-sign-closed.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level5-hash-sign-closed.html
rename to test/functional/makehtml/cases/karlcow/header-level5-hash-sign-closed.html
diff --git a/test/functional/cases/karlcow/header-level5-hash-sign-closed.md b/test/functional/makehtml/cases/karlcow/header-level5-hash-sign-closed.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level5-hash-sign-closed.md
rename to test/functional/makehtml/cases/karlcow/header-level5-hash-sign-closed.md
diff --git a/test/functional/cases/karlcow/header-level5-hash-sign.html b/test/functional/makehtml/cases/karlcow/header-level5-hash-sign.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level5-hash-sign.html
rename to test/functional/makehtml/cases/karlcow/header-level5-hash-sign.html
diff --git a/test/functional/cases/karlcow/header-level5-hash-sign.md b/test/functional/makehtml/cases/karlcow/header-level5-hash-sign.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level5-hash-sign.md
rename to test/functional/makehtml/cases/karlcow/header-level5-hash-sign.md
diff --git a/test/functional/cases/karlcow/header-level6-hash-sign-closed.html b/test/functional/makehtml/cases/karlcow/header-level6-hash-sign-closed.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level6-hash-sign-closed.html
rename to test/functional/makehtml/cases/karlcow/header-level6-hash-sign-closed.html
diff --git a/test/functional/cases/karlcow/header-level6-hash-sign-closed.md b/test/functional/makehtml/cases/karlcow/header-level6-hash-sign-closed.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level6-hash-sign-closed.md
rename to test/functional/makehtml/cases/karlcow/header-level6-hash-sign-closed.md
diff --git a/test/functional/cases/karlcow/header-level6-hash-sign.html b/test/functional/makehtml/cases/karlcow/header-level6-hash-sign.html
similarity index 100%
rename from test/functional/cases/karlcow/header-level6-hash-sign.html
rename to test/functional/makehtml/cases/karlcow/header-level6-hash-sign.html
diff --git a/test/functional/cases/karlcow/header-level6-hash-sign.md b/test/functional/makehtml/cases/karlcow/header-level6-hash-sign.md
similarity index 100%
rename from test/functional/cases/karlcow/header-level6-hash-sign.md
rename to test/functional/makehtml/cases/karlcow/header-level6-hash-sign.md
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-dashes-spaces.html b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-dashes-spaces.html
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes-spaces.html
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-dashes-spaces.md b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-dashes-spaces.md
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes-spaces.md
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-dashes.html b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes.html
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-dashes.html
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes.html
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-dashes.md b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes.md
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-dashes.md
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-dashes.md
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-stars.html b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-stars.html
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-stars.html
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-stars.html
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-stars.md b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-stars.md
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-stars.md
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-stars.md
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-underscores.html b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-underscores.html
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-underscores.html
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-underscores.html
diff --git a/test/functional/cases/karlcow/horizontal-rule-3-underscores.md b/test/functional/makehtml/cases/karlcow/horizontal-rule-3-underscores.md
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-3-underscores.md
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-3-underscores.md
diff --git a/test/functional/cases/karlcow/horizontal-rule-7-dashes.html b/test/functional/makehtml/cases/karlcow/horizontal-rule-7-dashes.html
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-7-dashes.html
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-7-dashes.html
diff --git a/test/functional/cases/karlcow/horizontal-rule-7-dashes.md b/test/functional/makehtml/cases/karlcow/horizontal-rule-7-dashes.md
similarity index 100%
rename from test/functional/cases/karlcow/horizontal-rule-7-dashes.md
rename to test/functional/makehtml/cases/karlcow/horizontal-rule-7-dashes.md
diff --git a/test/functional/cases/karlcow/img-idref-title.html b/test/functional/makehtml/cases/karlcow/img-idref-title.html
similarity index 100%
rename from test/functional/cases/karlcow/img-idref-title.html
rename to test/functional/makehtml/cases/karlcow/img-idref-title.html
diff --git a/test/functional/cases/karlcow/img-idref-title.md b/test/functional/makehtml/cases/karlcow/img-idref-title.md
similarity index 100%
rename from test/functional/cases/karlcow/img-idref-title.md
rename to test/functional/makehtml/cases/karlcow/img-idref-title.md
diff --git a/test/functional/cases/karlcow/img-idref.html b/test/functional/makehtml/cases/karlcow/img-idref.html
similarity index 100%
rename from test/functional/cases/karlcow/img-idref.html
rename to test/functional/makehtml/cases/karlcow/img-idref.html
diff --git a/test/functional/cases/karlcow/img-idref.md b/test/functional/makehtml/cases/karlcow/img-idref.md
similarity index 100%
rename from test/functional/cases/karlcow/img-idref.md
rename to test/functional/makehtml/cases/karlcow/img-idref.md
diff --git a/test/functional/cases/karlcow/img-title.html b/test/functional/makehtml/cases/karlcow/img-title.html
similarity index 100%
rename from test/functional/cases/karlcow/img-title.html
rename to test/functional/makehtml/cases/karlcow/img-title.html
diff --git a/test/functional/cases/karlcow/img-title.md b/test/functional/makehtml/cases/karlcow/img-title.md
similarity index 100%
rename from test/functional/cases/karlcow/img-title.md
rename to test/functional/makehtml/cases/karlcow/img-title.md
diff --git a/test/functional/cases/karlcow/img.html b/test/functional/makehtml/cases/karlcow/img.html
similarity index 100%
rename from test/functional/cases/karlcow/img.html
rename to test/functional/makehtml/cases/karlcow/img.html
diff --git a/test/functional/cases/karlcow/img.md b/test/functional/makehtml/cases/karlcow/img.md
similarity index 100%
rename from test/functional/cases/karlcow/img.md
rename to test/functional/makehtml/cases/karlcow/img.md
diff --git a/test/functional/cases/karlcow/inline-code-escaping-entities.html b/test/functional/makehtml/cases/karlcow/inline-code-escaping-entities.html
similarity index 100%
rename from test/functional/cases/karlcow/inline-code-escaping-entities.html
rename to test/functional/makehtml/cases/karlcow/inline-code-escaping-entities.html
diff --git a/test/functional/cases/karlcow/inline-code-escaping-entities.md b/test/functional/makehtml/cases/karlcow/inline-code-escaping-entities.md
similarity index 100%
rename from test/functional/cases/karlcow/inline-code-escaping-entities.md
rename to test/functional/makehtml/cases/karlcow/inline-code-escaping-entities.md
diff --git a/test/functional/cases/karlcow/inline-code-with-visible-backtick.html b/test/functional/makehtml/cases/karlcow/inline-code-with-visible-backtick.html
similarity index 100%
rename from test/functional/cases/karlcow/inline-code-with-visible-backtick.html
rename to test/functional/makehtml/cases/karlcow/inline-code-with-visible-backtick.html
diff --git a/test/functional/cases/karlcow/inline-code-with-visible-backtick.md b/test/functional/makehtml/cases/karlcow/inline-code-with-visible-backtick.md
similarity index 100%
rename from test/functional/cases/karlcow/inline-code-with-visible-backtick.md
rename to test/functional/makehtml/cases/karlcow/inline-code-with-visible-backtick.md
diff --git a/test/functional/cases/karlcow/inline-code.html b/test/functional/makehtml/cases/karlcow/inline-code.html
similarity index 100%
rename from test/functional/cases/karlcow/inline-code.html
rename to test/functional/makehtml/cases/karlcow/inline-code.html
diff --git a/test/functional/cases/karlcow/inline-code.md b/test/functional/makehtml/cases/karlcow/inline-code.md
similarity index 100%
rename from test/functional/cases/karlcow/inline-code.md
rename to test/functional/makehtml/cases/karlcow/inline-code.md
diff --git a/test/functional/cases/karlcow/line-break-2-spaces.html b/test/functional/makehtml/cases/karlcow/line-break-2-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/line-break-2-spaces.html
rename to test/functional/makehtml/cases/karlcow/line-break-2-spaces.html
diff --git a/test/functional/cases/karlcow/line-break-2-spaces.md b/test/functional/makehtml/cases/karlcow/line-break-2-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/line-break-2-spaces.md
rename to test/functional/makehtml/cases/karlcow/line-break-2-spaces.md
diff --git a/test/functional/cases/karlcow/line-break-5-spaces.html b/test/functional/makehtml/cases/karlcow/line-break-5-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/line-break-5-spaces.html
rename to test/functional/makehtml/cases/karlcow/line-break-5-spaces.html
diff --git a/test/functional/cases/karlcow/line-break-5-spaces.md b/test/functional/makehtml/cases/karlcow/line-break-5-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/line-break-5-spaces.md
rename to test/functional/makehtml/cases/karlcow/line-break-5-spaces.md
diff --git a/test/functional/cases/karlcow/link-automatic.html b/test/functional/makehtml/cases/karlcow/link-automatic.html
similarity index 100%
rename from test/functional/cases/karlcow/link-automatic.html
rename to test/functional/makehtml/cases/karlcow/link-automatic.html
diff --git a/test/functional/cases/karlcow/link-automatic.md b/test/functional/makehtml/cases/karlcow/link-automatic.md
similarity index 100%
rename from test/functional/cases/karlcow/link-automatic.md
rename to test/functional/makehtml/cases/karlcow/link-automatic.md
diff --git a/test/functional/cases/karlcow/link-bracket-paranthesis-title.html b/test/functional/makehtml/cases/karlcow/link-bracket-paranthesis-title.html
similarity index 100%
rename from test/functional/cases/karlcow/link-bracket-paranthesis-title.html
rename to test/functional/makehtml/cases/karlcow/link-bracket-paranthesis-title.html
diff --git a/test/functional/cases/karlcow/link-bracket-paranthesis-title.md b/test/functional/makehtml/cases/karlcow/link-bracket-paranthesis-title.md
similarity index 100%
rename from test/functional/cases/karlcow/link-bracket-paranthesis-title.md
rename to test/functional/makehtml/cases/karlcow/link-bracket-paranthesis-title.md
diff --git a/test/functional/cases/karlcow/link-bracket-paranthesis.html b/test/functional/makehtml/cases/karlcow/link-bracket-paranthesis.html
similarity index 100%
rename from test/functional/cases/karlcow/link-bracket-paranthesis.html
rename to test/functional/makehtml/cases/karlcow/link-bracket-paranthesis.html
diff --git a/test/functional/cases/karlcow/link-bracket-paranthesis.md b/test/functional/makehtml/cases/karlcow/link-bracket-paranthesis.md
similarity index 100%
rename from test/functional/cases/karlcow/link-bracket-paranthesis.md
rename to test/functional/makehtml/cases/karlcow/link-bracket-paranthesis.md
diff --git a/test/functional/cases/karlcow/link-idref-angle-bracket.html b/test/functional/makehtml/cases/karlcow/link-idref-angle-bracket.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-angle-bracket.html
rename to test/functional/makehtml/cases/karlcow/link-idref-angle-bracket.html
diff --git a/test/functional/cases/karlcow/link-idref-angle-bracket.md b/test/functional/makehtml/cases/karlcow/link-idref-angle-bracket.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-angle-bracket.md
rename to test/functional/makehtml/cases/karlcow/link-idref-angle-bracket.md
diff --git a/test/functional/cases/karlcow/link-idref-implicit-spaces.html b/test/functional/makehtml/cases/karlcow/link-idref-implicit-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-implicit-spaces.html
rename to test/functional/makehtml/cases/karlcow/link-idref-implicit-spaces.html
diff --git a/test/functional/cases/karlcow/link-idref-implicit-spaces.md b/test/functional/makehtml/cases/karlcow/link-idref-implicit-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-implicit-spaces.md
rename to test/functional/makehtml/cases/karlcow/link-idref-implicit-spaces.md
diff --git a/test/functional/cases/karlcow/link-idref-implicit.html b/test/functional/makehtml/cases/karlcow/link-idref-implicit.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-implicit.html
rename to test/functional/makehtml/cases/karlcow/link-idref-implicit.html
diff --git a/test/functional/cases/karlcow/link-idref-implicit.md b/test/functional/makehtml/cases/karlcow/link-idref-implicit.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-implicit.md
rename to test/functional/makehtml/cases/karlcow/link-idref-implicit.md
diff --git a/test/functional/cases/karlcow/link-idref-space.html b/test/functional/makehtml/cases/karlcow/link-idref-space.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-space.html
rename to test/functional/makehtml/cases/karlcow/link-idref-space.html
diff --git a/test/functional/cases/karlcow/link-idref-space.md b/test/functional/makehtml/cases/karlcow/link-idref-space.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-space.md
rename to test/functional/makehtml/cases/karlcow/link-idref-space.md
diff --git a/test/functional/cases/karlcow/link-idref-title-next-line.html b/test/functional/makehtml/cases/karlcow/link-idref-title-next-line.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title-next-line.html
rename to test/functional/makehtml/cases/karlcow/link-idref-title-next-line.html
diff --git a/test/functional/cases/karlcow/link-idref-title-next-line.md b/test/functional/makehtml/cases/karlcow/link-idref-title-next-line.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title-next-line.md
rename to test/functional/makehtml/cases/karlcow/link-idref-title-next-line.md
diff --git a/test/functional/cases/karlcow/link-idref-title-paranthesis.html b/test/functional/makehtml/cases/karlcow/link-idref-title-paranthesis.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title-paranthesis.html
rename to test/functional/makehtml/cases/karlcow/link-idref-title-paranthesis.html
diff --git a/test/functional/cases/karlcow/link-idref-title-paranthesis.md b/test/functional/makehtml/cases/karlcow/link-idref-title-paranthesis.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title-paranthesis.md
rename to test/functional/makehtml/cases/karlcow/link-idref-title-paranthesis.md
diff --git a/test/functional/cases/karlcow/link-idref-title-single-quote.html b/test/functional/makehtml/cases/karlcow/link-idref-title-single-quote.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title-single-quote.html
rename to test/functional/makehtml/cases/karlcow/link-idref-title-single-quote.html
diff --git a/test/functional/cases/karlcow/link-idref-title-single-quote.md b/test/functional/makehtml/cases/karlcow/link-idref-title-single-quote.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title-single-quote.md
rename to test/functional/makehtml/cases/karlcow/link-idref-title-single-quote.md
diff --git a/test/functional/cases/karlcow/link-idref-title.html b/test/functional/makehtml/cases/karlcow/link-idref-title.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title.html
rename to test/functional/makehtml/cases/karlcow/link-idref-title.html
diff --git a/test/functional/cases/karlcow/link-idref-title.md b/test/functional/makehtml/cases/karlcow/link-idref-title.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref-title.md
rename to test/functional/makehtml/cases/karlcow/link-idref-title.md
diff --git a/test/functional/cases/karlcow/link-idref.html b/test/functional/makehtml/cases/karlcow/link-idref.html
similarity index 100%
rename from test/functional/cases/karlcow/link-idref.html
rename to test/functional/makehtml/cases/karlcow/link-idref.html
diff --git a/test/functional/cases/karlcow/link-idref.md b/test/functional/makehtml/cases/karlcow/link-idref.md
similarity index 100%
rename from test/functional/cases/karlcow/link-idref.md
rename to test/functional/makehtml/cases/karlcow/link-idref.md
diff --git a/test/functional/cases/karlcow/list-blockquote.html b/test/functional/makehtml/cases/karlcow/list-blockquote.html
similarity index 100%
rename from test/functional/cases/karlcow/list-blockquote.html
rename to test/functional/makehtml/cases/karlcow/list-blockquote.html
diff --git a/test/functional/cases/karlcow/list-blockquote.md b/test/functional/makehtml/cases/karlcow/list-blockquote.md
similarity index 100%
rename from test/functional/cases/karlcow/list-blockquote.md
rename to test/functional/makehtml/cases/karlcow/list-blockquote.md
diff --git a/test/functional/cases/karlcow/list-code.html b/test/functional/makehtml/cases/karlcow/list-code.html
similarity index 100%
rename from test/functional/cases/karlcow/list-code.html
rename to test/functional/makehtml/cases/karlcow/list-code.html
diff --git a/test/functional/cases/karlcow/list-code.md b/test/functional/makehtml/cases/karlcow/list-code.md
similarity index 100%
rename from test/functional/cases/karlcow/list-code.md
rename to test/functional/makehtml/cases/karlcow/list-code.md
diff --git a/test/functional/cases/karlcow/list-multiparagraphs-tab.html b/test/functional/makehtml/cases/karlcow/list-multiparagraphs-tab.html
similarity index 100%
rename from test/functional/cases/karlcow/list-multiparagraphs-tab.html
rename to test/functional/makehtml/cases/karlcow/list-multiparagraphs-tab.html
diff --git a/test/functional/cases/karlcow/list-multiparagraphs-tab.md b/test/functional/makehtml/cases/karlcow/list-multiparagraphs-tab.md
similarity index 100%
rename from test/functional/cases/karlcow/list-multiparagraphs-tab.md
rename to test/functional/makehtml/cases/karlcow/list-multiparagraphs-tab.md
diff --git a/test/functional/cases/karlcow/list-multiparagraphs.html b/test/functional/makehtml/cases/karlcow/list-multiparagraphs.html
similarity index 100%
rename from test/functional/cases/karlcow/list-multiparagraphs.html
rename to test/functional/makehtml/cases/karlcow/list-multiparagraphs.html
diff --git a/test/functional/cases/karlcow/list-multiparagraphs.md b/test/functional/makehtml/cases/karlcow/list-multiparagraphs.md
similarity index 100%
rename from test/functional/cases/karlcow/list-multiparagraphs.md
rename to test/functional/makehtml/cases/karlcow/list-multiparagraphs.md
diff --git a/test/functional/cases/karlcow/ordered-list-escaped.html b/test/functional/makehtml/cases/karlcow/ordered-list-escaped.html
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-escaped.html
rename to test/functional/makehtml/cases/karlcow/ordered-list-escaped.html
diff --git a/test/functional/cases/karlcow/ordered-list-escaped.md b/test/functional/makehtml/cases/karlcow/ordered-list-escaped.md
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-escaped.md
rename to test/functional/makehtml/cases/karlcow/ordered-list-escaped.md
diff --git a/test/functional/cases/karlcow/ordered-list-inner-par-list.html b/test/functional/makehtml/cases/karlcow/ordered-list-inner-par-list.html
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-inner-par-list.html
rename to test/functional/makehtml/cases/karlcow/ordered-list-inner-par-list.html
diff --git a/test/functional/cases/karlcow/ordered-list-inner-par-list.md b/test/functional/makehtml/cases/karlcow/ordered-list-inner-par-list.md
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-inner-par-list.md
rename to test/functional/makehtml/cases/karlcow/ordered-list-inner-par-list.md
diff --git a/test/functional/cases/karlcow/ordered-list-items-random-number.html b/test/functional/makehtml/cases/karlcow/ordered-list-items-random-number.html
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-items-random-number.html
rename to test/functional/makehtml/cases/karlcow/ordered-list-items-random-number.html
diff --git a/test/functional/cases/karlcow/ordered-list-items-random-number.md b/test/functional/makehtml/cases/karlcow/ordered-list-items-random-number.md
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-items-random-number.md
rename to test/functional/makehtml/cases/karlcow/ordered-list-items-random-number.md
diff --git a/test/functional/cases/karlcow/ordered-list-items.html b/test/functional/makehtml/cases/karlcow/ordered-list-items.html
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-items.html
rename to test/functional/makehtml/cases/karlcow/ordered-list-items.html
diff --git a/test/functional/cases/karlcow/ordered-list-items.md b/test/functional/makehtml/cases/karlcow/ordered-list-items.md
similarity index 100%
rename from test/functional/cases/karlcow/ordered-list-items.md
rename to test/functional/makehtml/cases/karlcow/ordered-list-items.md
diff --git a/test/functional/cases/karlcow/paragraph-hard-return.html b/test/functional/makehtml/cases/karlcow/paragraph-hard-return.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-hard-return.html
rename to test/functional/makehtml/cases/karlcow/paragraph-hard-return.html
diff --git a/test/functional/cases/karlcow/paragraph-hard-return.md b/test/functional/makehtml/cases/karlcow/paragraph-hard-return.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-hard-return.md
rename to test/functional/makehtml/cases/karlcow/paragraph-hard-return.md
diff --git a/test/functional/cases/karlcow/paragraph-line.html b/test/functional/makehtml/cases/karlcow/paragraph-line.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-line.html
rename to test/functional/makehtml/cases/karlcow/paragraph-line.html
diff --git a/test/functional/cases/karlcow/paragraph-line.md b/test/functional/makehtml/cases/karlcow/paragraph-line.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-line.md
rename to test/functional/makehtml/cases/karlcow/paragraph-line.md
diff --git a/test/functional/cases/karlcow/paragraph-trailing-leading-spaces.html b/test/functional/makehtml/cases/karlcow/paragraph-trailing-leading-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-trailing-leading-spaces.html
rename to test/functional/makehtml/cases/karlcow/paragraph-trailing-leading-spaces.html
diff --git a/test/functional/cases/karlcow/paragraph-trailing-leading-spaces.md b/test/functional/makehtml/cases/karlcow/paragraph-trailing-leading-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-trailing-leading-spaces.md
rename to test/functional/makehtml/cases/karlcow/paragraph-trailing-leading-spaces.md
diff --git a/test/functional/cases/karlcow/paragraph-trailing-tab.html b/test/functional/makehtml/cases/karlcow/paragraph-trailing-tab.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-trailing-tab.html
rename to test/functional/makehtml/cases/karlcow/paragraph-trailing-tab.html
diff --git a/test/functional/cases/karlcow/paragraph-trailing-tab.md b/test/functional/makehtml/cases/karlcow/paragraph-trailing-tab.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraph-trailing-tab.md
rename to test/functional/makehtml/cases/karlcow/paragraph-trailing-tab.md
diff --git a/test/functional/cases/karlcow/paragraphs-2-leading-spaces.html b/test/functional/makehtml/cases/karlcow/paragraphs-2-leading-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-2-leading-spaces.html
rename to test/functional/makehtml/cases/karlcow/paragraphs-2-leading-spaces.html
diff --git a/test/functional/cases/karlcow/paragraphs-2-leading-spaces.md b/test/functional/makehtml/cases/karlcow/paragraphs-2-leading-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-2-leading-spaces.md
rename to test/functional/makehtml/cases/karlcow/paragraphs-2-leading-spaces.md
diff --git a/test/functional/cases/karlcow/paragraphs-3-leading-spaces.html b/test/functional/makehtml/cases/karlcow/paragraphs-3-leading-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-3-leading-spaces.html
rename to test/functional/makehtml/cases/karlcow/paragraphs-3-leading-spaces.html
diff --git a/test/functional/cases/karlcow/paragraphs-3-leading-spaces.md b/test/functional/makehtml/cases/karlcow/paragraphs-3-leading-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-3-leading-spaces.md
rename to test/functional/makehtml/cases/karlcow/paragraphs-3-leading-spaces.md
diff --git a/test/functional/cases/karlcow/paragraphs-leading-space.html b/test/functional/makehtml/cases/karlcow/paragraphs-leading-space.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-leading-space.html
rename to test/functional/makehtml/cases/karlcow/paragraphs-leading-space.html
diff --git a/test/functional/cases/karlcow/paragraphs-leading-space.md b/test/functional/makehtml/cases/karlcow/paragraphs-leading-space.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-leading-space.md
rename to test/functional/makehtml/cases/karlcow/paragraphs-leading-space.md
diff --git a/test/functional/cases/karlcow/paragraphs-trailing-spaces.html b/test/functional/makehtml/cases/karlcow/paragraphs-trailing-spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-trailing-spaces.html
rename to test/functional/makehtml/cases/karlcow/paragraphs-trailing-spaces.html
diff --git a/test/functional/cases/karlcow/paragraphs-trailing-spaces.md b/test/functional/makehtml/cases/karlcow/paragraphs-trailing-spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/paragraphs-trailing-spaces.md
rename to test/functional/makehtml/cases/karlcow/paragraphs-trailing-spaces.md
diff --git a/test/functional/cases/karlcow/strong-middle-word.html b/test/functional/makehtml/cases/karlcow/strong-middle-word.html
similarity index 100%
rename from test/functional/cases/karlcow/strong-middle-word.html
rename to test/functional/makehtml/cases/karlcow/strong-middle-word.html
diff --git a/test/functional/cases/karlcow/strong-middle-word.md b/test/functional/makehtml/cases/karlcow/strong-middle-word.md
similarity index 100%
rename from test/functional/cases/karlcow/strong-middle-word.md
rename to test/functional/makehtml/cases/karlcow/strong-middle-word.md
diff --git a/test/functional/cases/karlcow/strong-star.html b/test/functional/makehtml/cases/karlcow/strong-star.html
similarity index 100%
rename from test/functional/cases/karlcow/strong-star.html
rename to test/functional/makehtml/cases/karlcow/strong-star.html
diff --git a/test/functional/cases/karlcow/strong-star.md b/test/functional/makehtml/cases/karlcow/strong-star.md
similarity index 100%
rename from test/functional/cases/karlcow/strong-star.md
rename to test/functional/makehtml/cases/karlcow/strong-star.md
diff --git a/test/functional/cases/karlcow/strong-underscore.html b/test/functional/makehtml/cases/karlcow/strong-underscore.html
similarity index 100%
rename from test/functional/cases/karlcow/strong-underscore.html
rename to test/functional/makehtml/cases/karlcow/strong-underscore.html
diff --git a/test/functional/cases/karlcow/strong-underscore.md b/test/functional/makehtml/cases/karlcow/strong-underscore.md
similarity index 100%
rename from test/functional/cases/karlcow/strong-underscore.md
rename to test/functional/makehtml/cases/karlcow/strong-underscore.md
diff --git a/test/functional/cases/karlcow/unordered-list-items-asterisk.html b/test/functional/makehtml/cases/karlcow/unordered-list-items-asterisk.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-asterisk.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-asterisk.html
diff --git a/test/functional/cases/karlcow/unordered-list-items-asterisk.md b/test/functional/makehtml/cases/karlcow/unordered-list-items-asterisk.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-asterisk.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-asterisk.md
diff --git a/test/functional/cases/karlcow/unordered-list-items-dashsign.html b/test/functional/makehtml/cases/karlcow/unordered-list-items-dashsign.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-dashsign.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-dashsign.html
diff --git a/test/functional/cases/karlcow/unordered-list-items-dashsign.md b/test/functional/makehtml/cases/karlcow/unordered-list-items-dashsign.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-dashsign.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-dashsign.md
diff --git a/test/functional/cases/karlcow/unordered-list-items-leading-1space.html b/test/functional/makehtml/cases/karlcow/unordered-list-items-leading-1space.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-leading-1space.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-leading-1space.html
diff --git a/test/functional/cases/karlcow/unordered-list-items-leading-1space.md b/test/functional/makehtml/cases/karlcow/unordered-list-items-leading-1space.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-leading-1space.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-leading-1space.md
diff --git a/test/functional/cases/karlcow/unordered-list-items-leading-2spaces.html b/test/functional/makehtml/cases/karlcow/unordered-list-items-leading-2spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-leading-2spaces.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-leading-2spaces.html
diff --git a/test/functional/cases/karlcow/unordered-list-items-leading-2spaces.md b/test/functional/makehtml/cases/karlcow/unordered-list-items-leading-2spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-leading-2spaces.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-leading-2spaces.md
diff --git a/test/functional/cases/karlcow/unordered-list-items-leading-3spaces.html b/test/functional/makehtml/cases/karlcow/unordered-list-items-leading-3spaces.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-leading-3spaces.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-leading-3spaces.html
diff --git a/test/functional/cases/karlcow/unordered-list-items-leading-3spaces.md b/test/functional/makehtml/cases/karlcow/unordered-list-items-leading-3spaces.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-leading-3spaces.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-leading-3spaces.md
diff --git a/test/functional/cases/karlcow/unordered-list-items-plussign.html b/test/functional/makehtml/cases/karlcow/unordered-list-items-plussign.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-plussign.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-plussign.html
diff --git a/test/functional/cases/karlcow/unordered-list-items-plussign.md b/test/functional/makehtml/cases/karlcow/unordered-list-items-plussign.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-items-plussign.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-items-plussign.md
diff --git a/test/functional/cases/karlcow/unordered-list-paragraphs.html b/test/functional/makehtml/cases/karlcow/unordered-list-paragraphs.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-paragraphs.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-paragraphs.html
diff --git a/test/functional/cases/karlcow/unordered-list-paragraphs.md b/test/functional/makehtml/cases/karlcow/unordered-list-paragraphs.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-paragraphs.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-paragraphs.md
diff --git a/test/functional/cases/karlcow/unordered-list-unindented-content.html b/test/functional/makehtml/cases/karlcow/unordered-list-unindented-content.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-unindented-content.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-unindented-content.html
diff --git a/test/functional/cases/karlcow/unordered-list-unindented-content.md b/test/functional/makehtml/cases/karlcow/unordered-list-unindented-content.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-unindented-content.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-unindented-content.md
diff --git a/test/functional/cases/karlcow/unordered-list-with-indented-content.html b/test/functional/makehtml/cases/karlcow/unordered-list-with-indented-content.html
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-with-indented-content.html
rename to test/functional/makehtml/cases/karlcow/unordered-list-with-indented-content.html
diff --git a/test/functional/cases/karlcow/unordered-list-with-indented-content.md b/test/functional/makehtml/cases/karlcow/unordered-list-with-indented-content.md
similarity index 100%
rename from test/functional/cases/karlcow/unordered-list-with-indented-content.md
rename to test/functional/makehtml/cases/karlcow/unordered-list-with-indented-content.md
diff --git a/test/functional/cases/standard/anchors-by-reference.html b/test/functional/makehtml/cases/standard/anchors-by-reference.html
similarity index 100%
rename from test/functional/cases/standard/anchors-by-reference.html
rename to test/functional/makehtml/cases/standard/anchors-by-reference.html
diff --git a/test/functional/cases/standard/anchors-by-reference.md b/test/functional/makehtml/cases/standard/anchors-by-reference.md
similarity index 100%
rename from test/functional/cases/standard/anchors-by-reference.md
rename to test/functional/makehtml/cases/standard/anchors-by-reference.md
diff --git a/test/functional/cases/standard/anchors-followed-by-brakets.html b/test/functional/makehtml/cases/standard/anchors-followed-by-brakets.html
similarity index 100%
rename from test/functional/cases/standard/anchors-followed-by-brakets.html
rename to test/functional/makehtml/cases/standard/anchors-followed-by-brakets.html
diff --git a/test/functional/cases/standard/anchors-followed-by-brakets.md b/test/functional/makehtml/cases/standard/anchors-followed-by-brakets.md
similarity index 100%
rename from test/functional/cases/standard/anchors-followed-by-brakets.md
rename to test/functional/makehtml/cases/standard/anchors-followed-by-brakets.md
diff --git a/test/functional/cases/standard/automatic-anchors.html b/test/functional/makehtml/cases/standard/automatic-anchors.html
similarity index 100%
rename from test/functional/cases/standard/automatic-anchors.html
rename to test/functional/makehtml/cases/standard/automatic-anchors.html
diff --git a/test/functional/cases/standard/automatic-anchors.md b/test/functional/makehtml/cases/standard/automatic-anchors.md
similarity index 100%
rename from test/functional/cases/standard/automatic-anchors.md
rename to test/functional/makehtml/cases/standard/automatic-anchors.md
diff --git a/test/functional/cases/standard/blockquote-followed-by-code.html b/test/functional/makehtml/cases/standard/blockquote-followed-by-code.html
similarity index 100%
rename from test/functional/cases/standard/blockquote-followed-by-code.html
rename to test/functional/makehtml/cases/standard/blockquote-followed-by-code.html
diff --git a/test/functional/cases/standard/blockquote-followed-by-code.md b/test/functional/makehtml/cases/standard/blockquote-followed-by-code.md
similarity index 100%
rename from test/functional/cases/standard/blockquote-followed-by-code.md
rename to test/functional/makehtml/cases/standard/blockquote-followed-by-code.md
diff --git a/test/functional/cases/standard/blockquote-inside-code.html b/test/functional/makehtml/cases/standard/blockquote-inside-code.html
similarity index 100%
rename from test/functional/cases/standard/blockquote-inside-code.html
rename to test/functional/makehtml/cases/standard/blockquote-inside-code.html
diff --git a/test/functional/cases/standard/blockquote-inside-code.md b/test/functional/makehtml/cases/standard/blockquote-inside-code.md
similarity index 100%
rename from test/functional/cases/standard/blockquote-inside-code.md
rename to test/functional/makehtml/cases/standard/blockquote-inside-code.md
diff --git a/test/functional/cases/standard/blockquote-nested-markdown.html b/test/functional/makehtml/cases/standard/blockquote-nested-markdown.html
similarity index 100%
rename from test/functional/cases/standard/blockquote-nested-markdown.html
rename to test/functional/makehtml/cases/standard/blockquote-nested-markdown.html
diff --git a/test/functional/cases/standard/blockquote-nested-markdown.md b/test/functional/makehtml/cases/standard/blockquote-nested-markdown.md
similarity index 100%
rename from test/functional/cases/standard/blockquote-nested-markdown.md
rename to test/functional/makehtml/cases/standard/blockquote-nested-markdown.md
diff --git a/test/functional/cases/standard/blockquote.html b/test/functional/makehtml/cases/standard/blockquote.html
similarity index 100%
rename from test/functional/cases/standard/blockquote.html
rename to test/functional/makehtml/cases/standard/blockquote.html
diff --git a/test/functional/cases/standard/blockquote.md b/test/functional/makehtml/cases/standard/blockquote.md
similarity index 100%
rename from test/functional/cases/standard/blockquote.md
rename to test/functional/makehtml/cases/standard/blockquote.md
diff --git a/test/functional/cases/standard/code-block-html-escape.html b/test/functional/makehtml/cases/standard/code-block-html-escape.html
similarity index 100%
rename from test/functional/cases/standard/code-block-html-escape.html
rename to test/functional/makehtml/cases/standard/code-block-html-escape.html
diff --git a/test/functional/cases/standard/code-block-html-escape.md b/test/functional/makehtml/cases/standard/code-block-html-escape.md
similarity index 100%
rename from test/functional/cases/standard/code-block-html-escape.md
rename to test/functional/makehtml/cases/standard/code-block-html-escape.md
diff --git a/test/functional/cases/standard/code-block-with-special-chars.html b/test/functional/makehtml/cases/standard/code-block-with-special-chars.html
similarity index 100%
rename from test/functional/cases/standard/code-block-with-special-chars.html
rename to test/functional/makehtml/cases/standard/code-block-with-special-chars.html
diff --git a/test/functional/cases/standard/code-block-with-special-chars.md b/test/functional/makehtml/cases/standard/code-block-with-special-chars.md
similarity index 100%
rename from test/functional/cases/standard/code-block-with-special-chars.md
rename to test/functional/makehtml/cases/standard/code-block-with-special-chars.md
diff --git a/test/functional/cases/standard/code-block.html b/test/functional/makehtml/cases/standard/code-block.html
similarity index 100%
rename from test/functional/cases/standard/code-block.html
rename to test/functional/makehtml/cases/standard/code-block.html
diff --git a/test/functional/cases/standard/code-block.md b/test/functional/makehtml/cases/standard/code-block.md
similarity index 100%
rename from test/functional/cases/standard/code-block.md
rename to test/functional/makehtml/cases/standard/code-block.md
diff --git a/test/functional/cases/standard/double-emphasis.html b/test/functional/makehtml/cases/standard/double-emphasis.html
similarity index 100%
rename from test/functional/cases/standard/double-emphasis.html
rename to test/functional/makehtml/cases/standard/double-emphasis.html
diff --git a/test/functional/cases/standard/double-emphasis.md b/test/functional/makehtml/cases/standard/double-emphasis.md
similarity index 100%
rename from test/functional/cases/standard/double-emphasis.md
rename to test/functional/makehtml/cases/standard/double-emphasis.md
diff --git a/test/functional/cases/standard/doubline-list.html b/test/functional/makehtml/cases/standard/doubline-list.html
similarity index 100%
rename from test/functional/cases/standard/doubline-list.html
rename to test/functional/makehtml/cases/standard/doubline-list.html
diff --git a/test/functional/cases/standard/doubline-list.md b/test/functional/makehtml/cases/standard/doubline-list.md
similarity index 100%
rename from test/functional/cases/standard/doubline-list.md
rename to test/functional/makehtml/cases/standard/doubline-list.md
diff --git a/test/functional/cases/standard/ellipsis.html b/test/functional/makehtml/cases/standard/ellipsis.html
similarity index 100%
rename from test/functional/cases/standard/ellipsis.html
rename to test/functional/makehtml/cases/standard/ellipsis.html
diff --git a/test/functional/cases/standard/ellipsis.md b/test/functional/makehtml/cases/standard/ellipsis.md
similarity index 100%
rename from test/functional/cases/standard/ellipsis.md
rename to test/functional/makehtml/cases/standard/ellipsis.md
diff --git a/test/functional/cases/standard/emphasis-inside-inline-code.html b/test/functional/makehtml/cases/standard/emphasis-inside-inline-code.html
similarity index 100%
rename from test/functional/cases/standard/emphasis-inside-inline-code.html
rename to test/functional/makehtml/cases/standard/emphasis-inside-inline-code.html
diff --git a/test/functional/cases/standard/emphasis-inside-inline-code.md b/test/functional/makehtml/cases/standard/emphasis-inside-inline-code.md
similarity index 100%
rename from test/functional/cases/standard/emphasis-inside-inline-code.md
rename to test/functional/makehtml/cases/standard/emphasis-inside-inline-code.md
diff --git a/test/functional/cases/standard/emphasis.html b/test/functional/makehtml/cases/standard/emphasis.html
similarity index 100%
rename from test/functional/cases/standard/emphasis.html
rename to test/functional/makehtml/cases/standard/emphasis.html
diff --git a/test/functional/cases/standard/emphasis.md b/test/functional/makehtml/cases/standard/emphasis.md
similarity index 100%
rename from test/functional/cases/standard/emphasis.md
rename to test/functional/makehtml/cases/standard/emphasis.md
diff --git a/test/functional/cases/standard/encodeHTMLCodeTags.html b/test/functional/makehtml/cases/standard/encodeHTMLCodeTags.html
similarity index 100%
rename from test/functional/cases/standard/encodeHTMLCodeTags.html
rename to test/functional/makehtml/cases/standard/encodeHTMLCodeTags.html
diff --git a/test/functional/cases/standard/encodeHTMLCodeTags.md b/test/functional/makehtml/cases/standard/encodeHTMLCodeTags.md
similarity index 100%
rename from test/functional/cases/standard/encodeHTMLCodeTags.md
rename to test/functional/makehtml/cases/standard/encodeHTMLCodeTags.md
diff --git a/test/functional/cases/standard/escaped-number-period.html b/test/functional/makehtml/cases/standard/escaped-number-period.html
similarity index 100%
rename from test/functional/cases/standard/escaped-number-period.html
rename to test/functional/makehtml/cases/standard/escaped-number-period.html
diff --git a/test/functional/cases/standard/escaped-number-period.md b/test/functional/makehtml/cases/standard/escaped-number-period.md
similarity index 100%
rename from test/functional/cases/standard/escaped-number-period.md
rename to test/functional/makehtml/cases/standard/escaped-number-period.md
diff --git a/test/functional/cases/standard/escaping.html b/test/functional/makehtml/cases/standard/escaping.html
similarity index 100%
rename from test/functional/cases/standard/escaping.html
rename to test/functional/makehtml/cases/standard/escaping.html
diff --git a/test/functional/cases/standard/escaping.md b/test/functional/makehtml/cases/standard/escaping.md
similarity index 100%
rename from test/functional/cases/standard/escaping.md
rename to test/functional/makehtml/cases/standard/escaping.md
diff --git a/test/functional/cases/standard/github-style-at-start.html b/test/functional/makehtml/cases/standard/github-style-at-start.html
similarity index 100%
rename from test/functional/cases/standard/github-style-at-start.html
rename to test/functional/makehtml/cases/standard/github-style-at-start.html
diff --git a/test/functional/cases/standard/github-style-at-start.md b/test/functional/makehtml/cases/standard/github-style-at-start.md
similarity index 100%
rename from test/functional/cases/standard/github-style-at-start.md
rename to test/functional/makehtml/cases/standard/github-style-at-start.md
diff --git a/test/functional/cases/standard/github-style-codeblock-inside-quote.html b/test/functional/makehtml/cases/standard/github-style-codeblock-inside-quote.html
similarity index 100%
rename from test/functional/cases/standard/github-style-codeblock-inside-quote.html
rename to test/functional/makehtml/cases/standard/github-style-codeblock-inside-quote.html
diff --git a/test/functional/cases/standard/github-style-codeblock-inside-quote.md b/test/functional/makehtml/cases/standard/github-style-codeblock-inside-quote.md
similarity index 100%
rename from test/functional/cases/standard/github-style-codeblock-inside-quote.md
rename to test/functional/makehtml/cases/standard/github-style-codeblock-inside-quote.md
diff --git a/test/functional/cases/standard/github-style-codeblock.html b/test/functional/makehtml/cases/standard/github-style-codeblock.html
similarity index 100%
rename from test/functional/cases/standard/github-style-codeblock.html
rename to test/functional/makehtml/cases/standard/github-style-codeblock.html
diff --git a/test/functional/cases/standard/github-style-codeblock.md b/test/functional/makehtml/cases/standard/github-style-codeblock.md
similarity index 100%
rename from test/functional/cases/standard/github-style-codeblock.md
rename to test/functional/makehtml/cases/standard/github-style-codeblock.md
diff --git a/test/functional/cases/standard/github-style-linebreaks.html b/test/functional/makehtml/cases/standard/github-style-linebreaks.html
similarity index 100%
rename from test/functional/cases/standard/github-style-linebreaks.html
rename to test/functional/makehtml/cases/standard/github-style-linebreaks.html
diff --git a/test/functional/cases/standard/github-style-linebreaks.md b/test/functional/makehtml/cases/standard/github-style-linebreaks.md
similarity index 100%
rename from test/functional/cases/standard/github-style-linebreaks.md
rename to test/functional/makehtml/cases/standard/github-style-linebreaks.md
diff --git a/test/functional/cases/standard/h1-with-double-hash.html b/test/functional/makehtml/cases/standard/h1-with-double-hash.html
similarity index 100%
rename from test/functional/cases/standard/h1-with-double-hash.html
rename to test/functional/makehtml/cases/standard/h1-with-double-hash.html
diff --git a/test/functional/cases/standard/h1-with-double-hash.md b/test/functional/makehtml/cases/standard/h1-with-double-hash.md
similarity index 100%
rename from test/functional/cases/standard/h1-with-double-hash.md
rename to test/functional/makehtml/cases/standard/h1-with-double-hash.md
diff --git a/test/functional/cases/standard/h1-with-equals.html b/test/functional/makehtml/cases/standard/h1-with-equals.html
similarity index 100%
rename from test/functional/cases/standard/h1-with-equals.html
rename to test/functional/makehtml/cases/standard/h1-with-equals.html
diff --git a/test/functional/cases/standard/h1-with-equals.md b/test/functional/makehtml/cases/standard/h1-with-equals.md
similarity index 100%
rename from test/functional/cases/standard/h1-with-equals.md
rename to test/functional/makehtml/cases/standard/h1-with-equals.md
diff --git a/test/functional/cases/standard/h1-with-single-hash.html b/test/functional/makehtml/cases/standard/h1-with-single-hash.html
similarity index 100%
rename from test/functional/cases/standard/h1-with-single-hash.html
rename to test/functional/makehtml/cases/standard/h1-with-single-hash.html
diff --git a/test/functional/cases/standard/h1-with-single-hash.md b/test/functional/makehtml/cases/standard/h1-with-single-hash.md
similarity index 100%
rename from test/functional/cases/standard/h1-with-single-hash.md
rename to test/functional/makehtml/cases/standard/h1-with-single-hash.md
diff --git a/test/functional/cases/standard/h2-with-dashes.html b/test/functional/makehtml/cases/standard/h2-with-dashes.html
similarity index 100%
rename from test/functional/cases/standard/h2-with-dashes.html
rename to test/functional/makehtml/cases/standard/h2-with-dashes.html
diff --git a/test/functional/cases/standard/h2-with-dashes.md b/test/functional/makehtml/cases/standard/h2-with-dashes.md
similarity index 100%
rename from test/functional/cases/standard/h2-with-dashes.md
rename to test/functional/makehtml/cases/standard/h2-with-dashes.md
diff --git a/test/functional/cases/standard/h2-with-double-hash.html b/test/functional/makehtml/cases/standard/h2-with-double-hash.html
similarity index 100%
rename from test/functional/cases/standard/h2-with-double-hash.html
rename to test/functional/makehtml/cases/standard/h2-with-double-hash.html
diff --git a/test/functional/cases/standard/h2-with-double-hash.md b/test/functional/makehtml/cases/standard/h2-with-double-hash.md
similarity index 100%
rename from test/functional/cases/standard/h2-with-double-hash.md
rename to test/functional/makehtml/cases/standard/h2-with-double-hash.md
diff --git a/test/functional/cases/standard/h2-with-single-hash.html b/test/functional/makehtml/cases/standard/h2-with-single-hash.html
similarity index 100%
rename from test/functional/cases/standard/h2-with-single-hash.html
rename to test/functional/makehtml/cases/standard/h2-with-single-hash.html
diff --git a/test/functional/cases/standard/h2-with-single-hash.md b/test/functional/makehtml/cases/standard/h2-with-single-hash.md
similarity index 100%
rename from test/functional/cases/standard/h2-with-single-hash.md
rename to test/functional/makehtml/cases/standard/h2-with-single-hash.md
diff --git a/test/functional/cases/standard/h3-with-double-hash.html b/test/functional/makehtml/cases/standard/h3-with-double-hash.html
similarity index 100%
rename from test/functional/cases/standard/h3-with-double-hash.html
rename to test/functional/makehtml/cases/standard/h3-with-double-hash.html
diff --git a/test/functional/cases/standard/h3-with-double-hash.md b/test/functional/makehtml/cases/standard/h3-with-double-hash.md
similarity index 100%
rename from test/functional/cases/standard/h3-with-double-hash.md
rename to test/functional/makehtml/cases/standard/h3-with-double-hash.md
diff --git a/test/functional/cases/standard/h3-with-single-hash.html b/test/functional/makehtml/cases/standard/h3-with-single-hash.html
similarity index 100%
rename from test/functional/cases/standard/h3-with-single-hash.html
rename to test/functional/makehtml/cases/standard/h3-with-single-hash.html
diff --git a/test/functional/cases/standard/h3-with-single-hash.md b/test/functional/makehtml/cases/standard/h3-with-single-hash.md
similarity index 100%
rename from test/functional/cases/standard/h3-with-single-hash.md
rename to test/functional/makehtml/cases/standard/h3-with-single-hash.md
diff --git a/test/functional/cases/standard/h4-with-single-hash.html b/test/functional/makehtml/cases/standard/h4-with-single-hash.html
similarity index 100%
rename from test/functional/cases/standard/h4-with-single-hash.html
rename to test/functional/makehtml/cases/standard/h4-with-single-hash.html
diff --git a/test/functional/cases/standard/h4-with-single-hash.md b/test/functional/makehtml/cases/standard/h4-with-single-hash.md
similarity index 100%
rename from test/functional/cases/standard/h4-with-single-hash.md
rename to test/functional/makehtml/cases/standard/h4-with-single-hash.md
diff --git a/test/functional/cases/standard/h5-with-single-hash.html b/test/functional/makehtml/cases/standard/h5-with-single-hash.html
similarity index 100%
rename from test/functional/cases/standard/h5-with-single-hash.html
rename to test/functional/makehtml/cases/standard/h5-with-single-hash.html
diff --git a/test/functional/cases/standard/h5-with-single-hash.md b/test/functional/makehtml/cases/standard/h5-with-single-hash.md
similarity index 100%
rename from test/functional/cases/standard/h5-with-single-hash.md
rename to test/functional/makehtml/cases/standard/h5-with-single-hash.md
diff --git a/test/functional/cases/standard/h6-with-single-hash.html b/test/functional/makehtml/cases/standard/h6-with-single-hash.html
similarity index 100%
rename from test/functional/cases/standard/h6-with-single-hash.html
rename to test/functional/makehtml/cases/standard/h6-with-single-hash.html
diff --git a/test/functional/cases/standard/h6-with-single-hash.md b/test/functional/makehtml/cases/standard/h6-with-single-hash.md
similarity index 100%
rename from test/functional/cases/standard/h6-with-single-hash.md
rename to test/functional/makehtml/cases/standard/h6-with-single-hash.md
diff --git a/test/functional/cases/standard/horizontal-rules.html b/test/functional/makehtml/cases/standard/horizontal-rules.html
similarity index 100%
rename from test/functional/cases/standard/horizontal-rules.html
rename to test/functional/makehtml/cases/standard/horizontal-rules.html
diff --git a/test/functional/cases/standard/horizontal-rules.md b/test/functional/makehtml/cases/standard/horizontal-rules.md
similarity index 100%
rename from test/functional/cases/standard/horizontal-rules.md
rename to test/functional/makehtml/cases/standard/horizontal-rules.md
diff --git a/test/functional/cases/standard/html-comments.html b/test/functional/makehtml/cases/standard/html-comments.html
similarity index 100%
rename from test/functional/cases/standard/html-comments.html
rename to test/functional/makehtml/cases/standard/html-comments.html
diff --git a/test/functional/cases/standard/html-comments.md b/test/functional/makehtml/cases/standard/html-comments.md
similarity index 100%
rename from test/functional/cases/standard/html-comments.md
rename to test/functional/makehtml/cases/standard/html-comments.md
diff --git a/test/functional/cases/standard/html-inside-listed-code.html b/test/functional/makehtml/cases/standard/html-inside-listed-code.html
similarity index 100%
rename from test/functional/cases/standard/html-inside-listed-code.html
rename to test/functional/makehtml/cases/standard/html-inside-listed-code.html
diff --git a/test/functional/cases/standard/html-inside-listed-code.md b/test/functional/makehtml/cases/standard/html-inside-listed-code.md
similarity index 100%
rename from test/functional/cases/standard/html-inside-listed-code.md
rename to test/functional/makehtml/cases/standard/html-inside-listed-code.md
diff --git a/test/functional/cases/standard/html5-strutural-tags.html b/test/functional/makehtml/cases/standard/html5-strutural-tags.html
similarity index 100%
rename from test/functional/cases/standard/html5-strutural-tags.html
rename to test/functional/makehtml/cases/standard/html5-strutural-tags.html
diff --git a/test/functional/cases/standard/html5-strutural-tags.md b/test/functional/makehtml/cases/standard/html5-strutural-tags.md
similarity index 99%
rename from test/functional/cases/standard/html5-strutural-tags.md
rename to test/functional/makehtml/cases/standard/html5-strutural-tags.md
index 1775aca..bbf9c67 100644
--- a/test/functional/cases/standard/html5-strutural-tags.md
+++ b/test/functional/makehtml/cases/standard/html5-strutural-tags.md
@@ -1,4 +1,3 @@
-
 These HTML5 tags should pass through just fine.
 
 <section>hello</section>
diff --git a/test/functional/cases/standard/images-followed-by-brackets.html b/test/functional/makehtml/cases/standard/images-followed-by-brackets.html
similarity index 100%
rename from test/functional/cases/standard/images-followed-by-brackets.html
rename to test/functional/makehtml/cases/standard/images-followed-by-brackets.html
diff --git a/test/functional/cases/standard/images-followed-by-brackets.md b/test/functional/makehtml/cases/standard/images-followed-by-brackets.md
similarity index 100%
rename from test/functional/cases/standard/images-followed-by-brackets.md
rename to test/functional/makehtml/cases/standard/images-followed-by-brackets.md
diff --git a/test/functional/cases/standard/images.html b/test/functional/makehtml/cases/standard/images.html
similarity index 100%
rename from test/functional/cases/standard/images.html
rename to test/functional/makehtml/cases/standard/images.html
diff --git a/test/functional/cases/standard/images.md b/test/functional/makehtml/cases/standard/images.md
similarity index 99%
rename from test/functional/cases/standard/images.md
rename to test/functional/makehtml/cases/standard/images.md
index 9a85ffa..2cd5930 100644
--- a/test/functional/cases/standard/images.md
+++ b/test/functional/makehtml/cases/standard/images.md
@@ -1,4 +1,3 @@
-
 ![Alt text](/path/to/img.jpg)
 
 ![Alt text](/path/to/img.jpg "Optional title")
diff --git a/test/functional/cases/standard/implicit-anchors.html b/test/functional/makehtml/cases/standard/implicit-anchors.html
similarity index 100%
rename from test/functional/cases/standard/implicit-anchors.html
rename to test/functional/makehtml/cases/standard/implicit-anchors.html
diff --git a/test/functional/cases/standard/implicit-anchors.md b/test/functional/makehtml/cases/standard/implicit-anchors.md
similarity index 99%
rename from test/functional/cases/standard/implicit-anchors.md
rename to test/functional/makehtml/cases/standard/implicit-anchors.md
index d52d66a..9bec02f 100644
--- a/test/functional/cases/standard/implicit-anchors.md
+++ b/test/functional/makehtml/cases/standard/implicit-anchors.md
@@ -1,4 +1,3 @@
-
 Search the web at [Google][] or [Daring Fireball][].
 
 Search the web at [Google] or [Daring Fireball].
diff --git a/test/functional/cases/standard/inline-anchors.html b/test/functional/makehtml/cases/standard/inline-anchors.html
similarity index 100%
rename from test/functional/cases/standard/inline-anchors.html
rename to test/functional/makehtml/cases/standard/inline-anchors.html
diff --git a/test/functional/cases/standard/inline-anchors.md b/test/functional/makehtml/cases/standard/inline-anchors.md
similarity index 99%
rename from test/functional/cases/standard/inline-anchors.md
rename to test/functional/makehtml/cases/standard/inline-anchors.md
index cb6c15c..989f573 100644
--- a/test/functional/cases/standard/inline-anchors.md
+++ b/test/functional/makehtml/cases/standard/inline-anchors.md
@@ -1,4 +1,3 @@
-
 This is [an example](http://example.com/ "Title") inline link.
 
 [This link](http://example.net/) has no title attribute.
diff --git a/test/functional/cases/standard/inline-code.html b/test/functional/makehtml/cases/standard/inline-code.html
similarity index 100%
rename from test/functional/cases/standard/inline-code.html
rename to test/functional/makehtml/cases/standard/inline-code.html
diff --git a/test/functional/cases/standard/inline-code.md b/test/functional/makehtml/cases/standard/inline-code.md
similarity index 99%
rename from test/functional/cases/standard/inline-code.md
rename to test/functional/makehtml/cases/standard/inline-code.md
index 4817a6f..f809a23 100644
--- a/test/functional/cases/standard/inline-code.md
+++ b/test/functional/makehtml/cases/standard/inline-code.md
@@ -1,4 +1,3 @@
-
 Create a new `function`.
 
 Use the backtick in MySQL syntax ``SELECT `column` FROM whatever``.
diff --git a/test/functional/cases/standard/inline-escaped-chars.html b/test/functional/makehtml/cases/standard/inline-escaped-chars.html
similarity index 100%
rename from test/functional/cases/standard/inline-escaped-chars.html
rename to test/functional/makehtml/cases/standard/inline-escaped-chars.html
diff --git a/test/functional/cases/standard/inline-escaped-chars.md b/test/functional/makehtml/cases/standard/inline-escaped-chars.md
similarity index 98%
rename from test/functional/cases/standard/inline-escaped-chars.md
rename to test/functional/makehtml/cases/standard/inline-escaped-chars.md
index 7fb7fd3..93a43bc 100644
--- a/test/functional/cases/standard/inline-escaped-chars.md
+++ b/test/functional/makehtml/cases/standard/inline-escaped-chars.md
@@ -1,3 +1,2 @@
-
 Hello.this\_is\_a\_variable
 and.this.is.another_one
diff --git a/test/functional/cases/standard/inline-style-tag.html b/test/functional/makehtml/cases/standard/inline-style-tag.html
similarity index 100%
rename from test/functional/cases/standard/inline-style-tag.html
rename to test/functional/makehtml/cases/standard/inline-style-tag.html
diff --git a/test/functional/cases/standard/inline-style-tag.md b/test/functional/makehtml/cases/standard/inline-style-tag.md
similarity index 98%
rename from test/functional/cases/standard/inline-style-tag.md
rename to test/functional/makehtml/cases/standard/inline-style-tag.md
index c8d9cf3..65b63ca 100644
--- a/test/functional/cases/standard/inline-style-tag.md
+++ b/test/functional/makehtml/cases/standard/inline-style-tag.md
@@ -1,4 +1,3 @@
-
 <style>
     p { line-height: 20px; }
 </style>
diff --git a/test/functional/cases/standard/lazy-blockquote.html b/test/functional/makehtml/cases/standard/lazy-blockquote.html
similarity index 100%
rename from test/functional/cases/standard/lazy-blockquote.html
rename to test/functional/makehtml/cases/standard/lazy-blockquote.html
diff --git a/test/functional/cases/standard/lazy-blockquote.md b/test/functional/makehtml/cases/standard/lazy-blockquote.md
similarity index 98%
rename from test/functional/cases/standard/lazy-blockquote.md
rename to test/functional/makehtml/cases/standard/lazy-blockquote.md
index 696e177..86f80c9 100644
--- a/test/functional/cases/standard/lazy-blockquote.md
+++ b/test/functional/makehtml/cases/standard/lazy-blockquote.md
@@ -1,4 +1,3 @@
-
   > This is a multi line blockquote test
 
   > With more than one line.
diff --git a/test/functional/cases/standard/line-starts-with-html.html b/test/functional/makehtml/cases/standard/line-starts-with-html.html
similarity index 100%
rename from test/functional/cases/standard/line-starts-with-html.html
rename to test/functional/makehtml/cases/standard/line-starts-with-html.html
diff --git a/test/functional/cases/standard/line-starts-with-html.md b/test/functional/makehtml/cases/standard/line-starts-with-html.md
similarity index 100%
rename from test/functional/cases/standard/line-starts-with-html.md
rename to test/functional/makehtml/cases/standard/line-starts-with-html.md
diff --git a/test/functional/cases/standard/list-followed-by-blockquote.html b/test/functional/makehtml/cases/standard/list-followed-by-blockquote.html
similarity index 100%
rename from test/functional/cases/standard/list-followed-by-blockquote.html
rename to test/functional/makehtml/cases/standard/list-followed-by-blockquote.html
diff --git a/test/functional/cases/standard/list-followed-by-blockquote.md b/test/functional/makehtml/cases/standard/list-followed-by-blockquote.md
similarity index 100%
rename from test/functional/cases/standard/list-followed-by-blockquote.md
rename to test/functional/makehtml/cases/standard/list-followed-by-blockquote.md
diff --git a/test/functional/cases/standard/list-followed-by-ghcode.html b/test/functional/makehtml/cases/standard/list-followed-by-ghcode.html
similarity index 100%
rename from test/functional/cases/standard/list-followed-by-ghcode.html
rename to test/functional/makehtml/cases/standard/list-followed-by-ghcode.html
diff --git a/test/functional/cases/standard/list-followed-by-ghcode.md b/test/functional/makehtml/cases/standard/list-followed-by-ghcode.md
similarity index 100%
rename from test/functional/cases/standard/list-followed-by-ghcode.md
rename to test/functional/makehtml/cases/standard/list-followed-by-ghcode.md
diff --git a/test/functional/cases/standard/list-with-blockquote.html b/test/functional/makehtml/cases/standard/list-with-blockquote.html
similarity index 100%
rename from test/functional/cases/standard/list-with-blockquote.html
rename to test/functional/makehtml/cases/standard/list-with-blockquote.html
diff --git a/test/functional/cases/standard/list-with-blockquote.md b/test/functional/makehtml/cases/standard/list-with-blockquote.md
similarity index 100%
rename from test/functional/cases/standard/list-with-blockquote.md
rename to test/functional/makehtml/cases/standard/list-with-blockquote.md
diff --git a/test/functional/cases/standard/list-with-code.html b/test/functional/makehtml/cases/standard/list-with-code.html
similarity index 100%
rename from test/functional/cases/standard/list-with-code.html
rename to test/functional/makehtml/cases/standard/list-with-code.html
diff --git a/test/functional/cases/standard/list-with-code.md b/test/functional/makehtml/cases/standard/list-with-code.md
similarity index 100%
rename from test/functional/cases/standard/list-with-code.md
rename to test/functional/makehtml/cases/standard/list-with-code.md
diff --git a/test/functional/cases/standard/literal-html-tags.html b/test/functional/makehtml/cases/standard/literal-html-tags.html
similarity index 100%
rename from test/functional/cases/standard/literal-html-tags.html
rename to test/functional/makehtml/cases/standard/literal-html-tags.html
diff --git a/test/functional/cases/standard/literal-html-tags.md b/test/functional/makehtml/cases/standard/literal-html-tags.md
similarity index 100%
rename from test/functional/cases/standard/literal-html-tags.md
rename to test/functional/makehtml/cases/standard/literal-html-tags.md
diff --git a/test/functional/cases/standard/multi-paragraph-list.html b/test/functional/makehtml/cases/standard/multi-paragraph-list.html
similarity index 100%
rename from test/functional/cases/standard/multi-paragraph-list.html
rename to test/functional/makehtml/cases/standard/multi-paragraph-list.html
diff --git a/test/functional/cases/standard/multi-paragraph-list.md b/test/functional/makehtml/cases/standard/multi-paragraph-list.md
similarity index 98%
rename from test/functional/cases/standard/multi-paragraph-list.md
rename to test/functional/makehtml/cases/standard/multi-paragraph-list.md
index 78ccdd0..1e14867 100644
--- a/test/functional/cases/standard/multi-paragraph-list.md
+++ b/test/functional/makehtml/cases/standard/multi-paragraph-list.md
@@ -1,4 +1,3 @@
-
  1.  This is a major bullet point.
 
     That contains multiple paragraphs.
diff --git a/test/functional/cases/standard/multiline-unordered-list.html b/test/functional/makehtml/cases/standard/multiline-unordered-list.html
similarity index 100%
rename from test/functional/cases/standard/multiline-unordered-list.html
rename to test/functional/makehtml/cases/standard/multiline-unordered-list.html
diff --git a/test/functional/cases/standard/multiline-unordered-list.md b/test/functional/makehtml/cases/standard/multiline-unordered-list.md
similarity index 98%
rename from test/functional/cases/standard/multiline-unordered-list.md
rename to test/functional/makehtml/cases/standard/multiline-unordered-list.md
index a4470ab..2f52a4c 100644
--- a/test/functional/cases/standard/multiline-unordered-list.md
+++ b/test/functional/makehtml/cases/standard/multiline-unordered-list.md
@@ -1,4 +1,3 @@
-
  - This line spans
  more than one line and is lazy
  - Similar to this line
diff --git a/test/functional/cases/standard/nested-blockquote.html b/test/functional/makehtml/cases/standard/nested-blockquote.html
similarity index 100%
rename from test/functional/cases/standard/nested-blockquote.html
rename to test/functional/makehtml/cases/standard/nested-blockquote.html
diff --git a/test/functional/cases/standard/nested-blockquote.md b/test/functional/makehtml/cases/standard/nested-blockquote.md
similarity index 98%
rename from test/functional/cases/standard/nested-blockquote.md
rename to test/functional/makehtml/cases/standard/nested-blockquote.md
index 08247db..9585277 100644
--- a/test/functional/cases/standard/nested-blockquote.md
+++ b/test/functional/makehtml/cases/standard/nested-blockquote.md
@@ -1,4 +1,3 @@
-
   > This is a multi line blockquote test
   >
   > > And nesting!
diff --git a/test/functional/cases/standard/nested-gh-codeblocks.html b/test/functional/makehtml/cases/standard/nested-gh-codeblocks.html
similarity index 100%
rename from test/functional/cases/standard/nested-gh-codeblocks.html
rename to test/functional/makehtml/cases/standard/nested-gh-codeblocks.html
diff --git a/test/functional/cases/standard/nested-gh-codeblocks.md b/test/functional/makehtml/cases/standard/nested-gh-codeblocks.md
similarity index 100%
rename from test/functional/cases/standard/nested-gh-codeblocks.md
rename to test/functional/makehtml/cases/standard/nested-gh-codeblocks.md
diff --git a/test/functional/cases/standard/obfuscated-emails.html b/test/functional/makehtml/cases/standard/obfuscated-emails.html
similarity index 100%
rename from test/functional/cases/standard/obfuscated-emails.html
rename to test/functional/makehtml/cases/standard/obfuscated-emails.html
diff --git a/test/functional/cases/standard/obfuscated-emails.md b/test/functional/makehtml/cases/standard/obfuscated-emails.md
similarity index 100%
rename from test/functional/cases/standard/obfuscated-emails.md
rename to test/functional/makehtml/cases/standard/obfuscated-emails.md
diff --git a/test/functional/cases/standard/ordered-list-same-number.html b/test/functional/makehtml/cases/standard/ordered-list-same-number.html
similarity index 100%
rename from test/functional/cases/standard/ordered-list-same-number.html
rename to test/functional/makehtml/cases/standard/ordered-list-same-number.html
diff --git a/test/functional/cases/standard/ordered-list-same-number.md b/test/functional/makehtml/cases/standard/ordered-list-same-number.md
similarity index 96%
rename from test/functional/cases/standard/ordered-list-same-number.md
rename to test/functional/makehtml/cases/standard/ordered-list-same-number.md
index 2fd21c6..1759c55 100644
--- a/test/functional/cases/standard/ordered-list-same-number.md
+++ b/test/functional/makehtml/cases/standard/ordered-list-same-number.md
@@ -1,4 +1,3 @@
-
  1.  Red
  1.  Green
  1.  Blue
diff --git a/test/functional/cases/standard/ordered-list-starting-number.html b/test/functional/makehtml/cases/standard/ordered-list-starting-number.html
similarity index 100%
rename from test/functional/cases/standard/ordered-list-starting-number.html
rename to test/functional/makehtml/cases/standard/ordered-list-starting-number.html
diff --git a/test/functional/cases/standard/ordered-list-starting-number.md b/test/functional/makehtml/cases/standard/ordered-list-starting-number.md
similarity index 100%
rename from test/functional/cases/standard/ordered-list-starting-number.md
rename to test/functional/makehtml/cases/standard/ordered-list-starting-number.md
diff --git a/test/functional/cases/standard/ordered-list-wrong-numbers.html b/test/functional/makehtml/cases/standard/ordered-list-wrong-numbers.html
similarity index 100%
rename from test/functional/cases/standard/ordered-list-wrong-numbers.html
rename to test/functional/makehtml/cases/standard/ordered-list-wrong-numbers.html
diff --git a/test/functional/cases/standard/ordered-list-wrong-numbers.md b/test/functional/makehtml/cases/standard/ordered-list-wrong-numbers.md
similarity index 96%
rename from test/functional/cases/standard/ordered-list-wrong-numbers.md
rename to test/functional/makehtml/cases/standard/ordered-list-wrong-numbers.md
index 2fd21c6..1759c55 100644
--- a/test/functional/cases/standard/ordered-list-wrong-numbers.md
+++ b/test/functional/makehtml/cases/standard/ordered-list-wrong-numbers.md
@@ -1,4 +1,3 @@
-
  1.  Red
  1.  Green
  1.  Blue
diff --git a/test/functional/cases/standard/ordered-list.html b/test/functional/makehtml/cases/standard/ordered-list.html
similarity index 100%
rename from test/functional/cases/standard/ordered-list.html
rename to test/functional/makehtml/cases/standard/ordered-list.html
diff --git a/test/functional/cases/standard/ordered-list.md b/test/functional/makehtml/cases/standard/ordered-list.md
similarity index 96%
rename from test/functional/cases/standard/ordered-list.md
rename to test/functional/makehtml/cases/standard/ordered-list.md
index 8d668d2..2e2686a 100644
--- a/test/functional/cases/standard/ordered-list.md
+++ b/test/functional/makehtml/cases/standard/ordered-list.md
@@ -1,4 +1,3 @@
-
  1.  Red
  2.  Green
  3.  Blue
diff --git a/test/functional/cases/standard/paragraphed-list-with-sublists.html b/test/functional/makehtml/cases/standard/paragraphed-list-with-sublists.html
similarity index 100%
rename from test/functional/cases/standard/paragraphed-list-with-sublists.html
rename to test/functional/makehtml/cases/standard/paragraphed-list-with-sublists.html
diff --git a/test/functional/cases/standard/paragraphed-list-with-sublists.md b/test/functional/makehtml/cases/standard/paragraphed-list-with-sublists.md
similarity index 100%
rename from test/functional/cases/standard/paragraphed-list-with-sublists.md
rename to test/functional/makehtml/cases/standard/paragraphed-list-with-sublists.md
diff --git a/test/functional/cases/standard/pre-code-tags-inside-code-block.html b/test/functional/makehtml/cases/standard/pre-code-tags-inside-code-block.html
similarity index 100%
rename from test/functional/cases/standard/pre-code-tags-inside-code-block.html
rename to test/functional/makehtml/cases/standard/pre-code-tags-inside-code-block.html
diff --git a/test/functional/cases/standard/pre-code-tags-inside-code-block.md b/test/functional/makehtml/cases/standard/pre-code-tags-inside-code-block.md
similarity index 100%
rename from test/functional/cases/standard/pre-code-tags-inside-code-block.md
rename to test/functional/makehtml/cases/standard/pre-code-tags-inside-code-block.md
diff --git a/test/functional/cases/standard/pre-code-tags.html b/test/functional/makehtml/cases/standard/pre-code-tags.html
similarity index 100%
rename from test/functional/cases/standard/pre-code-tags.html
rename to test/functional/makehtml/cases/standard/pre-code-tags.html
diff --git a/test/functional/cases/standard/pre-code-tags.md b/test/functional/makehtml/cases/standard/pre-code-tags.md
similarity index 100%
rename from test/functional/cases/standard/pre-code-tags.md
rename to test/functional/makehtml/cases/standard/pre-code-tags.md
diff --git a/test/functional/cases/standard/relative-anchors.html b/test/functional/makehtml/cases/standard/relative-anchors.html
similarity index 100%
rename from test/functional/cases/standard/relative-anchors.html
rename to test/functional/makehtml/cases/standard/relative-anchors.html
diff --git a/test/functional/cases/standard/relative-anchors.md b/test/functional/makehtml/cases/standard/relative-anchors.md
similarity index 97%
rename from test/functional/cases/standard/relative-anchors.md
rename to test/functional/makehtml/cases/standard/relative-anchors.md
index 4358b0e..c42eeaf 100644
--- a/test/functional/cases/standard/relative-anchors.md
+++ b/test/functional/makehtml/cases/standard/relative-anchors.md
@@ -1,2 +1 @@
-
 See my [About](/about/) page for details.
diff --git a/test/functional/cases/standard/repeated-headers.html b/test/functional/makehtml/cases/standard/repeated-headers.html
similarity index 100%
rename from test/functional/cases/standard/repeated-headers.html
rename to test/functional/makehtml/cases/standard/repeated-headers.html
diff --git a/test/functional/cases/standard/repeated-headers.md b/test/functional/makehtml/cases/standard/repeated-headers.md
similarity index 100%
rename from test/functional/cases/standard/repeated-headers.md
rename to test/functional/makehtml/cases/standard/repeated-headers.md
diff --git a/test/functional/cases/standard/simple-paragraph.html b/test/functional/makehtml/cases/standard/simple-paragraph.html
similarity index 100%
rename from test/functional/cases/standard/simple-paragraph.html
rename to test/functional/makehtml/cases/standard/simple-paragraph.html
diff --git a/test/functional/cases/standard/simple-paragraph.md b/test/functional/makehtml/cases/standard/simple-paragraph.md
similarity index 93%
rename from test/functional/cases/standard/simple-paragraph.md
rename to test/functional/makehtml/cases/standard/simple-paragraph.md
index cb39a1f..af5626b 100644
--- a/test/functional/cases/standard/simple-paragraph.md
+++ b/test/functional/makehtml/cases/standard/simple-paragraph.md
@@ -1,2 +1 @@
-
 Hello, world!
diff --git a/test/functional/cases/standard/strip-references.html b/test/functional/makehtml/cases/standard/strip-references.html
similarity index 100%
rename from test/functional/cases/standard/strip-references.html
rename to test/functional/makehtml/cases/standard/strip-references.html
diff --git a/test/functional/cases/standard/strip-references.md b/test/functional/makehtml/cases/standard/strip-references.md
similarity index 100%
rename from test/functional/cases/standard/strip-references.md
rename to test/functional/makehtml/cases/standard/strip-references.md
diff --git a/test/functional/cases/standard/strong.html b/test/functional/makehtml/cases/standard/strong.html
similarity index 100%
rename from test/functional/cases/standard/strong.html
rename to test/functional/makehtml/cases/standard/strong.html
diff --git a/test/functional/cases/standard/strong.md b/test/functional/makehtml/cases/standard/strong.md
similarity index 98%
rename from test/functional/cases/standard/strong.md
rename to test/functional/makehtml/cases/standard/strong.md
index fc56e0c..6cc7163 100644
--- a/test/functional/cases/standard/strong.md
+++ b/test/functional/makehtml/cases/standard/strong.md
@@ -1,4 +1,3 @@
-
 **important**
 
 __important__
diff --git a/test/functional/cases/standard/unordered-list-asterisk.html b/test/functional/makehtml/cases/standard/unordered-list-asterisk.html
similarity index 100%
rename from test/functional/cases/standard/unordered-list-asterisk.html
rename to test/functional/makehtml/cases/standard/unordered-list-asterisk.html
diff --git a/test/functional/cases/standard/unordered-list-asterisk.md b/test/functional/makehtml/cases/standard/unordered-list-asterisk.md
similarity index 96%
rename from test/functional/cases/standard/unordered-list-asterisk.md
rename to test/functional/makehtml/cases/standard/unordered-list-asterisk.md
index 155d2fb..402a6ed 100644
--- a/test/functional/cases/standard/unordered-list-asterisk.md
+++ b/test/functional/makehtml/cases/standard/unordered-list-asterisk.md
@@ -1,4 +1,3 @@
-
  * Red
  * Green
  * Blue
diff --git a/test/functional/cases/standard/unordered-list-minus.html b/test/functional/makehtml/cases/standard/unordered-list-minus.html
similarity index 100%
rename from test/functional/cases/standard/unordered-list-minus.html
rename to test/functional/makehtml/cases/standard/unordered-list-minus.html
diff --git a/test/functional/cases/standard/unordered-list-minus.md b/test/functional/makehtml/cases/standard/unordered-list-minus.md
similarity index 96%
rename from test/functional/cases/standard/unordered-list-minus.md
rename to test/functional/makehtml/cases/standard/unordered-list-minus.md
index 1167d21..7e2e09a 100644
--- a/test/functional/cases/standard/unordered-list-minus.md
+++ b/test/functional/makehtml/cases/standard/unordered-list-minus.md
@@ -1,4 +1,3 @@
-
  - Red
  - Green
  - Blue
diff --git a/test/functional/cases/standard/unordered-list-plus.html b/test/functional/makehtml/cases/standard/unordered-list-plus.html
similarity index 100%
rename from test/functional/cases/standard/unordered-list-plus.html
rename to test/functional/makehtml/cases/standard/unordered-list-plus.html
diff --git a/test/functional/cases/standard/unordered-list-plus.md b/test/functional/makehtml/cases/standard/unordered-list-plus.md
similarity index 96%
rename from test/functional/cases/standard/unordered-list-plus.md
rename to test/functional/makehtml/cases/standard/unordered-list-plus.md
index 0b352a7..9c9e2f7 100644
--- a/test/functional/cases/standard/unordered-list-plus.md
+++ b/test/functional/makehtml/cases/standard/unordered-list-plus.md
@@ -1,4 +1,3 @@
-
  + Red
  + Green
  + Blue
diff --git a/test/functional/cases/standard/url-with-parenthesis.html b/test/functional/makehtml/cases/standard/url-with-parenthesis.html
similarity index 100%
rename from test/functional/cases/standard/url-with-parenthesis.html
rename to test/functional/makehtml/cases/standard/url-with-parenthesis.html
diff --git a/test/functional/cases/standard/url-with-parenthesis.md b/test/functional/makehtml/cases/standard/url-with-parenthesis.md
similarity index 100%
rename from test/functional/cases/standard/url-with-parenthesis.md
rename to test/functional/makehtml/cases/standard/url-with-parenthesis.md
diff --git a/test/functional/makehtml/testsuite.features.js b/test/functional/makehtml/testsuite.features.js
index d49cc68..3efa178 100644
--- a/test/functional/makehtml/testsuite.features.js
+++ b/test/functional/makehtml/testsuite.features.js
@@ -4,20 +4,20 @@
 var bootstrap = require('./makehtml.bootstrap.js'),
     showdown = bootstrap.showdown,
     assertion = bootstrap.assertion,
-    testsuite = bootstrap.getTestSuite('test/functional/cases/features/'),
-    tableSuite = bootstrap.getTestSuite('test/functional/cases/features/tables/'),
-    simplifiedAutoLinkSuite = bootstrap.getTestSuite('test/functional/cases/features/simplifiedAutoLink/'),
-    openLinksInNewWindowSuite = bootstrap.getTestSuite('test/functional/cases/features/openLinksInNewWindow/'),
-    disableForced4SpacesIndentedSublistsSuite = bootstrap.getTestSuite('test/functional/cases/features/disableForced4SpacesIndentedSublists/'),
-    rawHeaderIdSuite = bootstrap.getTestSuite('test/functional/cases/features/rawHeaderId/'),
-    rawPrefixHeaderIdSuite = bootstrap.getTestSuite('test/functional/cases/features/rawPrefixHeaderId/'),
-    emojisSuite = bootstrap.getTestSuite('test/functional/cases/features/emojis/'),
-    underlineSuite = bootstrap.getTestSuite('test/functional/cases/features/underline/'),
-    literalMidWordUnderscoresSuite = bootstrap.getTestSuite('test/functional/cases/features/literalMidWordUnderscores/'),
-    literalMidWordAsterisksSuite = bootstrap.getTestSuite('test/functional/cases/features/literalMidWordAsterisks/'),
-    completeHTMLOutputSuite = bootstrap.getTestSuite('test/functional/cases/features/completeHTMLOutput/'),
-    metadataSuite = bootstrap.getTestSuite('test/functional/cases/features/metadata/'),
-    splitAdjacentBlockquotesSuite = bootstrap.getTestSuite('test/functional/cases/features/splitAdjacentBlockquotes/');
+    testsuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/'),
+    tableSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/tables/'),
+    simplifiedAutoLinkSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/simplifiedAutoLink/'),
+    openLinksInNewWindowSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/openLinksInNewWindow/'),
+    disableForced4SpacesIndentedSublistsSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/disableForced4SpacesIndentedSublists/'),
+    rawHeaderIdSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/rawHeaderId/'),
+    rawPrefixHeaderIdSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/rawPrefixHeaderId/'),
+    emojisSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/emojis/'),
+    underlineSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/underline/'),
+    literalMidWordUnderscoresSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/literalMidWordUnderscores/'),
+    literalMidWordAsterisksSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/literalMidWordAsterisks/'),
+    completeHTMLOutputSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/completeHTMLOutput/'),
+    metadataSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/metadata/'),
+    splitAdjacentBlockquotesSuite = bootstrap.getTestSuite('test/functional/makehtml/cases/features/splitAdjacentBlockquotes/');
 
 describe('makeHtml() features testsuite', function () {
   'use strict';
diff --git a/test/functional/makehtml/testsuite.ghost.js b/test/functional/makehtml/testsuite.ghost.js
index 0d48108..cbffcf3 100644
--- a/test/functional/makehtml/testsuite.ghost.js
+++ b/test/functional/makehtml/testsuite.ghost.js
@@ -11,7 +11,7 @@ var bootstrap = require('./makehtml.bootstrap.js'),
       tasklists:                 true  //extra
     }),
     assertion = bootstrap.assertion,
-    testsuite = bootstrap.getTestSuite('test/functional/cases/ghost/');
+    testsuite = bootstrap.getTestSuite('test/functional/makehtml/cases/ghost/');
 
 //MD-Testsuite (borrowed from karlcow/markdown-testsuite)
 describe('makeHtml() ghost testsuite', function () {
diff --git a/test/functional/makehtml/testsuite.issues.js b/test/functional/makehtml/testsuite.issues.js
index 79b21ba..6ace606 100644
--- a/test/functional/makehtml/testsuite.issues.js
+++ b/test/functional/makehtml/testsuite.issues.js
@@ -4,7 +4,7 @@
 var bootstrap = require('./makehtml.bootstrap.js'),
     converter = new bootstrap.showdown.Converter(),
     assertion = bootstrap.assertion,
-    testsuite = bootstrap.getTestSuite('test/functional/cases/issues/');
+    testsuite = bootstrap.getTestSuite('test/functional/makehtml/cases/issues/');
 
 describe('makeHtml() issues testsuite', function () {
   'use strict';
diff --git a/test/functional/makehtml/testsuite.karlcow.js b/test/functional/makehtml/testsuite.karlcow.js
index 9fb2944..6cbae52 100644
--- a/test/functional/makehtml/testsuite.karlcow.js
+++ b/test/functional/makehtml/testsuite.karlcow.js
@@ -5,7 +5,7 @@
 var bootstrap = require('./makehtml.bootstrap.js'),
     converter = new bootstrap.showdown.Converter({noHeaderId: true}),
     assertion = bootstrap.assertion,
-    testsuite = bootstrap.getTestSuite('test/functional/cases/karlcow/');
+    testsuite = bootstrap.getTestSuite('test/functional/makehtml/cases/karlcow/');
 
 //MD-Testsuite (borrowed from karlcow/markdown-testsuite)
 describe('makeHtml() karlcow testsuite', function () {
diff --git a/test/functional/makehtml/testsuite.standard.js b/test/functional/makehtml/testsuite.standard.js
index 47f4a5d..81fc123 100644
--- a/test/functional/makehtml/testsuite.standard.js
+++ b/test/functional/makehtml/testsuite.standard.js
@@ -5,7 +5,7 @@
 var bootstrap = require('./makehtml.bootstrap.js'),
     converter = new bootstrap.showdown.Converter(),
     assertion = bootstrap.assertion,
-    testsuite = bootstrap.getTestSuite('test/functional/cases/standard/');
+    testsuite = bootstrap.getTestSuite('test/functional/makehtml/cases/standard/');
 
 describe('makeHtml() standard testsuite', function () {
   'use strict';
diff --git a/test/functional/makemarkdown/cases/standard/anchors-relative.html b/test/functional/makemarkdown/cases/standard/anchors-relative.html
new file mode 100644
index 0000000..6db73dc
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/anchors-relative.html
@@ -0,0 +1 @@
+<p>See my <a href="/about/">About</a> page for details.</p>
diff --git a/test/functional/makemarkdown/cases/standard/anchors-relative.md b/test/functional/makemarkdown/cases/standard/anchors-relative.md
new file mode 100644
index 0000000..c42eeaf
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/anchors-relative.md
@@ -0,0 +1 @@
+See my [About](/about/) page for details.
diff --git a/test/functional/makemarkdown/cases/standard/anchors.html b/test/functional/makemarkdown/cases/standard/anchors.html
new file mode 100644
index 0000000..69a8a2e
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/anchors.html
@@ -0,0 +1,2 @@
+<p>This is <a href="http://example.com/" title="Title">an example</a> inline link.</p>
+<p><a href="http://example.net/">This link</a> has no title attribute.</p>
diff --git a/test/functional/makemarkdown/cases/standard/anchors.md b/test/functional/makemarkdown/cases/standard/anchors.md
new file mode 100644
index 0000000..989f573
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/anchors.md
@@ -0,0 +1,3 @@
+This is [an example](http://example.com/ "Title") inline link.
+
+[This link](http://example.net/) has no title attribute.
diff --git a/test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.html b/test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.html
new file mode 100644
index 0000000..babf16c
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.html
@@ -0,0 +1,9 @@
+<blockquote>
+    <p>a blockquote
+with a 4 space indented line (not code)</p>
+</blockquote>
+<p>sep</p>
+<blockquote>
+    <p>a blockquote</p>
+</blockquote>
+<pre><code>with some code after</code></pre>
diff --git a/test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.md b/test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.md
new file mode 100644
index 0000000..e70298f
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/blockquote-followed-by-code.md
@@ -0,0 +1,9 @@
+> a blockquote with a 4 space indented line (not code)
+
+sep
+
+> a blockquote
+
+```
+with some code after
+```
diff --git a/test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.html b/test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.html
new file mode 100644
index 0000000..a73ca6e
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.html
@@ -0,0 +1,10 @@
+<blockquote>
+  <h2 id="thisisaheader">This is a header.</h2>
+  <ol>
+    <li>This is the first list item.</li>
+    <li>This is the second list item.</li>
+  </ol>
+  <p>Here's some example code:</p>
+    <pre><code>return shell_exec("echo $input | $markdown_script");
+    </code></pre>
+</blockquote>
diff --git a/test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.md b/test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.md
new file mode 100644
index 0000000..ab2cdce
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/blockquote-nested-markdown.md
@@ -0,0 +1,10 @@
+> ## This is a header.
+>
+> 1. This is the first list item.
+> 2. This is the second list item.
+>
+> Here's some example code:
+>
+> ```
+> return shell_exec("echo $input | $markdown_script");
+> ```
diff --git a/test/functional/makemarkdown/cases/standard/blockquote.html b/test/functional/makemarkdown/cases/standard/blockquote.html
new file mode 100644
index 0000000..3f27012
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/blockquote.html
@@ -0,0 +1,4 @@
+<blockquote>
+<p>This is a multi line blockquote test</p>
+<p>With more than one line.</p>
+</blockquote>
diff --git a/test/functional/makemarkdown/cases/standard/blockquote.md b/test/functional/makemarkdown/cases/standard/blockquote.md
new file mode 100644
index 0000000..c4099d3
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/blockquote.md
@@ -0,0 +1,3 @@
+> This is a multi line blockquote test
+>
+> With more than one line.
diff --git a/test/functional/makemarkdown/cases/standard/emphasis-double.html b/test/functional/makemarkdown/cases/standard/emphasis-double.html
new file mode 100644
index 0000000..02932e2
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/emphasis-double.html
@@ -0,0 +1,2 @@
+<p>a <strong><em>strong and em</em></strong> thingy</p>
+<p>bar<strong><em>bazinga</em></strong>bar</p>
diff --git a/test/functional/makemarkdown/cases/standard/emphasis-double.md b/test/functional/makemarkdown/cases/standard/emphasis-double.md
new file mode 100644
index 0000000..5f94406
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/emphasis-double.md
@@ -0,0 +1,3 @@
+a ***strong and em*** thingy
+
+bar***bazinga***bar
diff --git a/test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.html b/test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.html
new file mode 100644
index 0000000..0a70937
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.html
@@ -0,0 +1 @@
+<p>some text <code>**foo**</code></p>
diff --git a/test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.md b/test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.md
new file mode 100644
index 0000000..df8b95d
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/emphasis-inside-inline-code.md
@@ -0,0 +1 @@
+some text `**foo**`
diff --git a/test/functional/makemarkdown/cases/standard/emphasis.html b/test/functional/makemarkdown/cases/standard/emphasis.html
new file mode 100644
index 0000000..44f7831
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/emphasis.html
@@ -0,0 +1,37 @@
+<p><em>single asterisks</em></p>
+<p><em>single underscores</em></p>
+<p><strong>double asterisks</strong></p>
+<p><strong>double underscores</strong></p>
+<p>text <em>with italic sentence</em> in middle</p>
+<p>text <strong>with bold sentence</strong> in middle</p>
+<p>text with <strong>bold text that
+  spans across multiple</strong> lines</p>
+<p>underscored_word</p>
+<p>doubleunderscore__word</p>
+<p>asterix*word</p>
+<p>doubleasterix**word</p>
+<p>line with_underscored word</p>
+<p>line with__doubleunderscored word</p>
+<p>line with*asterixed word</p>
+<p>line with**doubleasterixed word</p>
+<p>some line<em>with</em>inner underscores</p>
+<p>some line<strong>with</strong>inner double underscores</p>
+<p>some line<em>with</em>inner asterixs</p>
+<p>some line<strong>with</strong>inner double asterixs</p>
+<p>another line with just _one underscore</p>
+<p>another line with just __one double underscore</p>
+<p>another line with just *one asterix</p>
+<p>another line with just **one double asterix</p>
+<p>a sentence with<em>underscore and another</em>underscore</p>
+<p>a sentence with<strong>doubleunderscore and another</strong>doubleunderscore</p>
+<p>a sentence with<em>asterix and another</em>asterix</p>
+<p>a sentence with<strong>doubleasterix and another</strong>doubleasterix</p>
+<p>escaped word_with_underscores</p>
+<p>escaped word__with__double underscores</p>
+<p>escaped word<em>_with_</em>single italic underscore</p>
+<p>escaped word*with*asterixs</p>
+<p>escaped word**with**asterixs</p>
+<p>escaped word<strong>*with*</strong>bold asterixs</p>
+<p>foo<strong>bar</strong>baz</p>
+<p>foo<strong>bar</strong>baz</p>
+<p>this is <strong><a href="//google.com">imbued link with strong</a></strong></p>
diff --git a/test/functional/makemarkdown/cases/standard/emphasis.md b/test/functional/makemarkdown/cases/standard/emphasis.md
new file mode 100644
index 0000000..789c597
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/emphasis.md
@@ -0,0 +1,71 @@
+*single asterisks*
+
+*single underscores*
+
+**double asterisks**
+
+**double underscores**
+
+text *with italic sentence* in middle
+
+text **with bold sentence** in middle
+
+text with **bold text that spans across multiple** lines
+
+underscored\_word
+
+doubleunderscore\_\_word
+
+asterix\*word
+
+doubleasterix\*\*word
+
+line with\_underscored word
+
+line with\_\_doubleunderscored word
+
+line with\*asterixed word
+
+line with\*\*doubleasterixed word
+
+some line*with*inner underscores
+
+some line**with**inner double underscores
+
+some line*with*inner asterixs
+
+some line**with**inner double asterixs
+
+another line with just \_one underscore
+
+another line with just \_\_one double underscore
+
+another line with just \*one asterix
+
+another line with just \*\*one double asterix
+
+a sentence with*underscore and another*underscore
+
+a sentence with**doubleunderscore and another**doubleunderscore
+
+a sentence with*asterix and another*asterix
+
+a sentence with**doubleasterix and another**doubleasterix
+
+escaped word\_with\_underscores
+
+escaped word\_\_with\_\_double underscores
+
+escaped word*\_with\_*single italic underscore
+
+escaped word\*with\*asterixs
+
+escaped word\*\*with\*\*asterixs
+
+escaped word**\*with\***bold asterixs
+
+foo**bar**baz
+
+foo**bar**baz
+
+this is **[imbued link with strong](//google.com)**
diff --git a/test/functional/makemarkdown/cases/standard/escaping-html-entities.html b/test/functional/makemarkdown/cases/standard/escaping-html-entities.html
new file mode 100644
index 0000000..86cb370
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/escaping-html-entities.html
@@ -0,0 +1,4 @@
+<p>a &quot;quoted&quot; string</p>
+<p>duarte&amp;companhia</p>
+<p>1 &lt; 2</p>
+<p>2 &gt; 1</p>
diff --git a/test/functional/makemarkdown/cases/standard/escaping-html-entities.md b/test/functional/makemarkdown/cases/standard/escaping-html-entities.md
new file mode 100644
index 0000000..ecb7acd
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/escaping-html-entities.md
@@ -0,0 +1,7 @@
+a "quoted" string
+
+duarte&companhia
+
+1 < 2
+
+2 > 1
diff --git a/test/functional/makemarkdown/cases/standard/escaping.html b/test/functional/makemarkdown/cases/standard/escaping.html
new file mode 100644
index 0000000..d55e1b3
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/escaping.html
@@ -0,0 +1,17 @@
+<p>[a false reference]: must be escaped</p>
+<p> - a list item</p>
+<p>*</p>
+<p>~</p>
+<p>|</p>
+<p>[a faux](link)</p>
+<p># at start</p>
+<p>in the # middle is ok</p>
+<p>> at start</p>
+<p>in the middle > is ok</p>
+<p>---</p>
+<p>1. must be escaped</p>
+<p>but. this should not</p>
+<p>. nor this</p>
+<p>or this.</p>
+<p>    four ate the beginning of line are removed</p>
+<p>multiple spaces    are colapsed to 1</p>
diff --git a/test/functional/makemarkdown/cases/standard/escaping.md b/test/functional/makemarkdown/cases/standard/escaping.md
new file mode 100644
index 0000000..1678b8a
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/escaping.md
@@ -0,0 +1,33 @@
+\[a false reference]: must be escaped
+
+ \- a list item
+
+\*
+
+\~
+
+\|
+
+[a faux\]\(link)
+
+\# at start
+
+in the # middle is ok
+
+\> at start
+
+in the middle > is ok
+
+\---
+
+1\. must be escaped
+
+but. this should not
+
+. nor this
+
+or this.
+
+four ate the beginning of line are removed
+
+multiple spaces are colapsed to 1
diff --git a/test/functional/makemarkdown/cases/standard/github-style-at-start.html b/test/functional/makemarkdown/cases/standard/github-style-at-start.html
new file mode 100644
index 0000000..79c0044
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-at-start.html
@@ -0,0 +1,5 @@
+<pre><code>function MyFunc(a) {
+  // ...
+  }
+</code></pre>
+<p>That is some code!</p>
diff --git a/test/functional/makemarkdown/cases/standard/github-style-at-start.md b/test/functional/makemarkdown/cases/standard/github-style-at-start.md
new file mode 100644
index 0000000..557d63c
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-at-start.md
@@ -0,0 +1,7 @@
+```
+function MyFunc(a) {
+    // ...
+}
+```
+
+That is some code!
diff --git a/test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.html b/test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.html
new file mode 100644
index 0000000..776c79a
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.html
@@ -0,0 +1,13 @@
+<blockquote>
+<p>Define a function in javascript:</p>
+<pre><code>
+function MyFunc(a) {
+    var s = '`';
+}
+</code></pre>
+<blockquote>
+<p>And some nested quote</p>
+<pre><code class="html language-html">&lt;div&gt;HTML!&lt;/div&gt;
+</code></pre>
+</blockquote>
+</blockquote>
diff --git a/test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.md b/test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.md
new file mode 100644
index 0000000..b0fa757
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-codeblock-inside-quote.md
@@ -0,0 +1,13 @@
+> Define a function in javascript:
+>
+> ```
+> function MyFunc(a) {
+>     var s = '`';
+> }
+> ```
+>
+> > And some nested quote
+> >
+> > ```html
+> > <div>HTML!</div>
+> > ```
diff --git a/test/functional/makemarkdown/cases/standard/github-style-codeblock.html b/test/functional/makemarkdown/cases/standard/github-style-codeblock.html
new file mode 100644
index 0000000..785f51b
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-codeblock.html
@@ -0,0 +1,13 @@
+<p>Define a function in javascript:</p>
+<pre><code>function MyFunc(a) {
+  var s = '`';
+  }
+</code></pre>
+<p>And some HTML</p>
+<pre><code class="html language-html">&lt;div&gt;HTML!&lt;/div&gt;
+</code></pre>
+<pre><code data-language="javascript">
+function foo() {
+    return 'bar';
+}
+</code></pre>
diff --git a/test/functional/makemarkdown/cases/standard/github-style-codeblock.md b/test/functional/makemarkdown/cases/standard/github-style-codeblock.md
new file mode 100644
index 0000000..0443315
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-codeblock.md
@@ -0,0 +1,20 @@
+
+Define a function in javascript:
+
+```
+function MyFunc(a) {
+    var s = '`';
+}
+```
+
+And some HTML
+
+```html
+<div>HTML!</div>
+```
+
+```javascript
+function foo() {
+return 'bar';
+}
+```
diff --git a/test/functional/makemarkdown/cases/standard/github-style-linebreaks.html b/test/functional/makemarkdown/cases/standard/github-style-linebreaks.html
new file mode 100644
index 0000000..e92a482
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-linebreaks.html
@@ -0,0 +1,3 @@
+<pre><code>code can go here
+  this is rendered on a second line
+</code></pre>
diff --git a/test/functional/makemarkdown/cases/standard/github-style-linebreaks.md b/test/functional/makemarkdown/cases/standard/github-style-linebreaks.md
new file mode 100644
index 0000000..1b55536
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/github-style-linebreaks.md
@@ -0,0 +1,4 @@
+```
+code can go here
+this is rendered on a second line
+```
diff --git a/test/functional/makemarkdown/cases/standard/h1-with-single-hash.html b/test/functional/makemarkdown/cases/standard/h1-with-single-hash.html
new file mode 100644
index 0000000..ab5b555
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h1-with-single-hash.html
@@ -0,0 +1 @@
+<h1 id="thisisanh1">This is an H1</h1>
diff --git a/test/functional/makemarkdown/cases/standard/h1-with-single-hash.md b/test/functional/makemarkdown/cases/standard/h1-with-single-hash.md
new file mode 100644
index 0000000..90944c9
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h1-with-single-hash.md
@@ -0,0 +1 @@
+# This is an H1
diff --git a/test/functional/makemarkdown/cases/standard/h2-with-single-hash.html b/test/functional/makemarkdown/cases/standard/h2-with-single-hash.html
new file mode 100644
index 0000000..375a0d0
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h2-with-single-hash.html
@@ -0,0 +1 @@
+<h2 id="thisisanh2">This is an H2</h2>
diff --git a/test/functional/makemarkdown/cases/standard/h2-with-single-hash.md b/test/functional/makemarkdown/cases/standard/h2-with-single-hash.md
new file mode 100644
index 0000000..bf1c56f
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h2-with-single-hash.md
@@ -0,0 +1 @@
+## This is an H2
diff --git a/test/functional/makemarkdown/cases/standard/h3-with-single-hash.html b/test/functional/makemarkdown/cases/standard/h3-with-single-hash.html
new file mode 100644
index 0000000..13f8c9e
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h3-with-single-hash.html
@@ -0,0 +1 @@
+<h3 id="thisisanh3">This is an H3</h3>
diff --git a/test/functional/makemarkdown/cases/standard/h3-with-single-hash.md b/test/functional/makemarkdown/cases/standard/h3-with-single-hash.md
new file mode 100644
index 0000000..247ce34
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h3-with-single-hash.md
@@ -0,0 +1 @@
+### This is an H3
diff --git a/test/functional/makemarkdown/cases/standard/h4-with-single-hash.html b/test/functional/makemarkdown/cases/standard/h4-with-single-hash.html
new file mode 100644
index 0000000..165b4ef
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h4-with-single-hash.html
@@ -0,0 +1 @@
+<h4 id="thisisanh4">This is an H4</h4>
diff --git a/test/functional/makemarkdown/cases/standard/h4-with-single-hash.md b/test/functional/makemarkdown/cases/standard/h4-with-single-hash.md
new file mode 100644
index 0000000..36f0db0
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h4-with-single-hash.md
@@ -0,0 +1 @@
+#### This is an H4
diff --git a/test/functional/makemarkdown/cases/standard/h5-with-single-hash.html b/test/functional/makemarkdown/cases/standard/h5-with-single-hash.html
new file mode 100644
index 0000000..28eac14
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h5-with-single-hash.html
@@ -0,0 +1 @@
+<h5 id="thisisanh5">This is an H5</h5>
diff --git a/test/functional/makemarkdown/cases/standard/h5-with-single-hash.md b/test/functional/makemarkdown/cases/standard/h5-with-single-hash.md
new file mode 100644
index 0000000..a66d50b
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h5-with-single-hash.md
@@ -0,0 +1 @@
+##### This is an H5
diff --git a/test/functional/makemarkdown/cases/standard/h6-with-single-hash.html b/test/functional/makemarkdown/cases/standard/h6-with-single-hash.html
new file mode 100644
index 0000000..47574cc
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h6-with-single-hash.html
@@ -0,0 +1 @@
+<h6 id="thisisanh6">This is an H6</h6>
diff --git a/test/functional/makemarkdown/cases/standard/h6-with-single-hash.md b/test/functional/makemarkdown/cases/standard/h6-with-single-hash.md
new file mode 100644
index 0000000..c85f1a7
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/h6-with-single-hash.md
@@ -0,0 +1 @@
+###### This is an H6
diff --git a/test/functional/makemarkdown/cases/standard/html-comments.html b/test/functional/makemarkdown/cases/standard/html-comments.html
new file mode 100644
index 0000000..215b8c6
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/html-comments.html
@@ -0,0 +1,9 @@
+<!-- a comment -->
+<!-- a comment with *bogus* __markdown__ inside -->
+<!-- comment -->
+<p>words</p>
+   <!-- comment -->
+<pre><code>&lt;!-- comment --&gt;
+</code></pre>
+<p>&lt;!----------------------------------------------------------------------------------------------------------------------------------------------------</p>
+<!-------------------------------------------------------------------->
diff --git a/test/functional/makemarkdown/cases/standard/html-comments.md b/test/functional/makemarkdown/cases/standard/html-comments.md
new file mode 100644
index 0000000..436d5b9
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/html-comments.md
@@ -0,0 +1,17 @@
+<!-- a comment -->
+
+<!-- a comment with *bogus* __markdown__ inside -->
+
+<!-- comment -->
+
+words
+
+<!-- comment -->
+
+```
+<!-- comment -->
+```
+
+<!----------------------------------------------------------------------------------------------------------------------------------------------------
+
+<!-------------------------------------------------------------------->
diff --git a/test/functional/makemarkdown/cases/standard/html.html b/test/functional/makemarkdown/cases/standard/html.html
new file mode 100644
index 0000000..7039db1
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/html.html
@@ -0,0 +1,10 @@
+<div>
+    some text
+</div>
+
+<span>an inline element</span>
+
+<div>
+    <span>a span inside a div</span>
+</div>
+
diff --git a/test/functional/makemarkdown/cases/standard/html.md b/test/functional/makemarkdown/cases/standard/html.md
new file mode 100644
index 0000000..4d9c824
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/html.md
@@ -0,0 +1,6 @@
+<div> some text </div>
+
+<span>an inline element</span>
+
+<div><span>a span inside a div</span></div>
+
diff --git a/test/functional/makemarkdown/cases/standard/html5-strutural-tags.html b/test/functional/makemarkdown/cases/standard/html5-strutural-tags.html
new file mode 100644
index 0000000..9437a87
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/html5-strutural-tags.html
@@ -0,0 +1,34 @@
+<p>These HTML5 tags should pass through just fine.</p>
+<section>hello</section>
+<header>head</header>
+<footer>footsies</footer>
+<nav>navigation</nav>
+<article>read me</article>
+<aside>ignore me</aside>
+<article>read
+  me</article>
+<aside>
+  ignore me
+</aside>
+<p>the end</p>
+<audio class="podcastplayer" controls>
+  <source src="foobar.mp3" type="audio/mp3" preload="none"></source>
+  <source src="foobar.off" type="audio/ogg" preload="none"></source>
+</audio>
+<video src="foo.ogg">
+  <track kind="subtitles" src="foo.en.vtt" srclang="en" label="English">
+  <track kind="subtitles" src="foo.sv.vtt" srclang="sv" label="Svenska">
+</video>
+<address>My street</address>
+<canvas id="canvas" width="300" height="300">
+  Sorry, your browser doesn't support the &lt;canvas&gt; element.
+</canvas>
+<figure>
+  <img src="mypic.png" alt="An awesome picture">
+  <figcaption>Caption for the awesome picture</figcaption>
+</figure>
+<hgroup>
+  <h1>Main title</h1>
+  <h2>Secondary title</h2>
+</hgroup>
+<output name="result"></output>
diff --git a/test/functional/makemarkdown/cases/standard/html5-strutural-tags.md b/test/functional/makemarkdown/cases/standard/html5-strutural-tags.md
new file mode 100644
index 0000000..3c6c7c8
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/html5-strutural-tags.md
@@ -0,0 +1,33 @@
+These HTML5 tags should pass through just fine.
+
+<section>hello</section>
+
+<header>head</header>
+
+<footer>footsies</footer>
+
+<nav>navigation</nav>
+
+<article>read me</article>
+
+<aside>ignore me</aside>
+
+<article>read me</article>
+
+<aside> ignore me </aside>
+
+the end
+
+<audio class="podcastplayer" controls=""><source src="foobar.mp3" type="audio/mp3" preload="none"><source src="foobar.off" type="audio/ogg" preload="none"></audio>
+
+<video src="foo.ogg"><track kind="subtitles" src="foo.en.vtt" srclang="en" label="English"><track kind="subtitles" src="foo.sv.vtt" srclang="sv" label="Svenska"></video>
+
+<address>My street</address>
+
+<canvas id="canvas" width="300" height="300"> Sorry, your browser doesn't support the &lt;canvas&gt; element. </canvas>
+
+<figure><img src="mypic.png" alt="An awesome picture"><figcaption>Caption for the awesome picture</figcaption></figure>
+
+<hgroup><h1>Main title</h1><h2>Secondary title</h2></hgroup>
+
+<output name="result"></output>
diff --git a/test/functional/makemarkdown/cases/standard/images.html b/test/functional/makemarkdown/cases/standard/images.html
new file mode 100644
index 0000000..f28e0b9
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/images.html
@@ -0,0 +1,6 @@
+<p><img src="/path/to/img.jpg" alt="Alt text" /></p>
+<p><img src="/path/to/img.jpg" alt="Alt text" title="Optional title" /></p>
+<p><img src="url/to/image.jpg" alt="Alt text" title="Optional title attribute" /></p>
+<p><img src="url/to/image2.jpg" alt="My Image" title="Optional title attribute" /></p>
+<p>![leave me alone]</p>
+<p>![leave me alone][]</p>
diff --git a/test/functional/makemarkdown/cases/standard/images.md b/test/functional/makemarkdown/cases/standard/images.md
new file mode 100644
index 0000000..4296c97
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/images.md
@@ -0,0 +1,11 @@
+![Alt text](/path/to/img.jpg)
+
+![Alt text](/path/to/img.jpg "Optional title")
+
+![Alt text](url/to/image.jpg "Optional title attribute")
+
+![My Image](url/to/image2.jpg "Optional title attribute")
+
+![leave me alone]
+
+![leave me alone][]
diff --git a/test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.html b/test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.html
new file mode 100644
index 0000000..8eea4b3
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.html
@@ -0,0 +1,8 @@
+<pre><code>1. some code idented 4 spaces
+
+    ```
+    var foobar = 'foo';
+    ```
+
+2. another line
+</code></pre>
diff --git a/test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.md b/test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.md
new file mode 100644
index 0000000..515d8c7
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/nested-gh-codeblocks.md
@@ -0,0 +1,9 @@
+```
+1. some code idented 4 spaces
+
+    ```
+    var foobar = 'foo';
+    ```
+
+2. another line
+```
diff --git a/test/functional/makemarkdown/cases/standard/ordered-list-starting-number.html b/test/functional/makemarkdown/cases/standard/ordered-list-starting-number.html
new file mode 100644
index 0000000..ea1b39a
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/ordered-list-starting-number.html
@@ -0,0 +1,5 @@
+<ol start="5">
+    <li>foo</li>
+    <li>bar</li>
+    <li>baz</li>
+</ol>
diff --git a/test/functional/makemarkdown/cases/standard/ordered-list-starting-number.md b/test/functional/makemarkdown/cases/standard/ordered-list-starting-number.md
new file mode 100644
index 0000000..8576e95
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/ordered-list-starting-number.md
@@ -0,0 +1,4 @@
+5. foo
+6. bar
+7. baz
+
diff --git a/test/functional/makemarkdown/cases/standard/ordered-list.html b/test/functional/makemarkdown/cases/standard/ordered-list.html
new file mode 100644
index 0000000..a48b0b7
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/ordered-list.html
@@ -0,0 +1,5 @@
+<ol>
+  <li>Red</li>
+  <li>Green</li>
+  <li>Blue</li>
+</ol>
diff --git a/test/functional/makemarkdown/cases/standard/ordered-list.md b/test/functional/makemarkdown/cases/standard/ordered-list.md
new file mode 100644
index 0000000..f523e13
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/ordered-list.md
@@ -0,0 +1,3 @@
+ 1. Red
+ 2. Green
+ 3. Blue
diff --git a/test/functional/makemarkdown/cases/standard/paragraph-simple.html b/test/functional/makemarkdown/cases/standard/paragraph-simple.html
new file mode 100644
index 0000000..7ce5354
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/paragraph-simple.html
@@ -0,0 +1 @@
+<p>Hello, world!</p>
diff --git a/test/functional/makemarkdown/cases/standard/paragraph-simple.md b/test/functional/makemarkdown/cases/standard/paragraph-simple.md
new file mode 100644
index 0000000..af5626b
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/paragraph-simple.md
@@ -0,0 +1 @@
+Hello, world!
diff --git a/test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.html b/test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.html
new file mode 100644
index 0000000..0367bb2
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.html
@@ -0,0 +1,11 @@
+<ul>
+  <li><p>foo</p>
+    <ul>
+      <li><p>bazinga</p></li>
+      <li><p>yeah</p></li></ul></li>
+  <li><p>bar</p>
+    <ol>
+      <li><p>damn</p></li>
+      <li><p>so many paragraphs</p></li></ol></li>
+  <li><p>baz</p></li>
+</ul>
diff --git a/test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.md b/test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.md
new file mode 100644
index 0000000..4aade2a
--- /dev/null
+++ b/test/functional/makemarkdown/cases/standard/paragraphed-list-with-sublists.md
@@ -0,0 +1,13 @@
+ - foo
+ 
+    - bazinga
+    
+    - yeah
+ 
+ - bar
+ 
+    1. damn
+    
+    2. so many paragraphs
+ 
+ - baz
diff --git a/test/functional/makemarkdown/makemarkdown.bootstrap.js b/test/functional/makemarkdown/makemarkdown.bootstrap.js
new file mode 100644
index 0000000..81032ab
--- /dev/null
+++ b/test/functional/makemarkdown/makemarkdown.bootstrap.js
@@ -0,0 +1,85 @@
+/**
+ * Created by Estevao on 22-12-2017.
+ */
+
+//jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+(function () {
+  'use strict';
+
+  require('source-map-support').install();
+  require('chai').should();
+  var fs = require('fs');
+
+  function getTestSuite (dir) {
+    return fs.readdirSync(dir)
+      .filter(filter())
+      .map(map(dir));
+  }
+
+  function filter () {
+    return function (file) {
+      var ext = file.slice(-3);
+      return (ext === '.md');
+    };
+  }
+
+  function map (dir) {
+    return function (file) {
+      var name = file.replace('.md', ''),
+          htmlPath = dir + name + '.html',
+          html = fs.readFileSync(htmlPath, 'utf8'),
+          mdPath = dir + name + '.md',
+          md = fs.readFileSync(mdPath, 'utf8');
+
+      return {
+        name:     name,
+        input:    html,
+        expected: md
+      };
+    };
+  }
+
+  function assertion (testCase, converter) {
+    return function () {
+      testCase.actual = converter.makeMarkdown(testCase.input);
+      testCase = normalize(testCase);
+
+      // Compare
+      testCase.actual.should.equal(testCase.expected);
+    };
+  }
+
+  //Normalize input/output
+  function normalize (testCase) {
+
+    // Normalize line returns
+    testCase.expected = testCase.expected.replace(/(\r\n)|\n|\r/g, '\n');
+    testCase.actual = testCase.actual.replace(/(\r\n)|\n|\r/g, '\n');
+
+    // Ignore all leading/trailing whitespace
+    testCase.expected = testCase.expected.split('\n').map(function (x) {
+      return x.trim();
+    }).join('\n');
+    testCase.actual = testCase.actual.split('\n').map(function (x) {
+      return x.trim();
+    }).join('\n');
+
+    // Remove extra lines
+    testCase.expected = testCase.expected.trim();
+    testCase.actual = testCase.actual.trim();
+
+    // Normalize line returns
+    testCase.expected = testCase.expected.replace(/(\r\n)|\n|\r/g, '\n');
+    testCase.actual = testCase.actual.replace(/(\r\n)|\n|\r/g, '\n');
+
+    return testCase;
+  }
+
+  module.exports = {
+    getTestSuite: getTestSuite,
+    assertion: assertion,
+    normalize: normalize,
+    showdown: require('../../../.build/showdown.js')
+  };
+})();
+
diff --git a/test/functional/makemarkdown/testsuite.standard.js b/test/functional/makemarkdown/testsuite.standard.js
new file mode 100644
index 0000000..923b863
--- /dev/null
+++ b/test/functional/makemarkdown/testsuite.standard.js
@@ -0,0 +1,15 @@
+/**
+ * Created by Estevao on 08-06-2015.
+ */
+
+var bootstrap = require('./makemarkdown.bootstrap.js'),
+    converter = new bootstrap.showdown.Converter(),
+    assertion = bootstrap.assertion,
+    testsuite = bootstrap.getTestSuite('test/functional/makemarkdown/cases/standard/');
+
+describe('makeMarkdown() standard testsuite', function () {
+  'use strict';
+  for (var i = 0; i < testsuite.length; ++i) {
+    it(testsuite[i].name.replace(/-/g, ' '), assertion(testsuite[i], converter));
+  }
+});