From 21168bf5f12baf4947023b39feef235b81c00541 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sun, 15 Apr 2018 20:18:15 -0400
Subject: [PATCH] remove v1 parser tests

---
 test/parser/index.js                          |  67 +++----
 .../samples/action-with-call/input-v2.html    |   1 -
 .../samples/action-with-call/output-v2.json   |  47 -----
 .../action-with-identifier/input-v2.html      |   1 -
 .../action-with-identifier/output-v2.json     |  33 ----
 .../samples/action-with-literal/input-v2.html |   1 -
 .../action-with-literal/output-v2.json        |  34 ----
 test/parser/samples/action/input-v2.html      |   1 -
 test/parser/samples/action/output-v2.json     |  28 ---
 .../attribute-dynamic-boolean/input-v2.html   |   1 -
 .../attribute-dynamic-boolean/input.html      |   2 +-
 .../attribute-dynamic-boolean/output-v2.json  |  40 ----
 .../attribute-dynamic-boolean/output.json     |  16 +-
 .../attribute-dynamic-reserved/input-v2.html  |   1 -
 .../attribute-dynamic-reserved/input.html     |   2 +-
 .../attribute-dynamic-reserved/output-v2.json |  40 ----
 .../attribute-dynamic-reserved/output.json    |  16 +-
 .../samples/attribute-dynamic/input-v2.html   |   1 -
 .../samples/attribute-dynamic/input.html      |   2 +-
 .../samples/attribute-dynamic/output-v2.json  |  64 ------
 .../samples/attribute-dynamic/output.json     |  26 +--
 .../samples/attribute-escaped/input-v2.html   |   1 -
 .../samples/attribute-escaped/output-v2.json  |  35 ----
 .../samples/attribute-multiple/input-v2.html  |   1 -
 .../samples/attribute-multiple/input.html     |   2 +-
 .../samples/attribute-multiple/output-v2.json |  49 -----
 .../samples/attribute-shorthand/input-v2.html |   1 -
 .../samples/attribute-shorthand/input.html    |   2 +-
 .../attribute-shorthand/output-v2.json        |  40 ----
 .../samples/attribute-shorthand/output.json   |   6 +-
 .../attribute-static-boolean/input-v2.html    |   1 -
 .../attribute-static-boolean/input.html       |   2 +-
 .../attribute-static-boolean/output-v2.json   |  28 ---
 .../samples/attribute-static/input-v2.html    |   1 -
 .../samples/attribute-static/input.html       |   2 +-
 .../samples/attribute-static/output-v2.json   |  35 ----
 .../attribute-unique-error/error-v2.json      |   9 -
 .../attribute-unique-error/input-v2.html      |   1 -
 .../samples/attribute-unique-error/input.html |   2 +-
 .../samples/attribute-unquoted/input-v2.html  |   1 -
 .../samples/attribute-unquoted/input.html     |   2 +-
 .../samples/attribute-unquoted/output-v2.json |  35 ----
 .../samples/await-then-catch/input-v2.html    |   7 -
 .../samples/await-then-catch/input.html       |  12 +-
 .../samples/await-then-catch/output-v2.json   | 161 ----------------
 .../samples/await-then-catch/output.json      |  94 ++++-----
 .../samples/binding-shorthand/input-v2.html   |   1 -
 .../samples/binding-shorthand/input.html      |   2 +-
 .../samples/binding-shorthand/output-v2.json  |  33 ----
 test/parser/samples/binding/input-v2.html     |   1 -
 test/parser/samples/binding/input.html        |   2 +-
 test/parser/samples/binding/output-v2.json    |  33 ----
 test/parser/samples/comment/input-v2.html     |   1 -
 test/parser/samples/comment/input.html        |   2 +-
 test/parser/samples/comment/output-v2.json    |  18 --
 .../samples/component-dynamic/input-v2.html   |   1 -
 .../samples/component-dynamic/input.html      |   2 +-
 .../samples/component-dynamic/output-v2.json  |  43 -----
 .../samples/component-dynamic/output.json     |  24 +--
 .../convert-entities-in-element/input-v2.html |   1 -
 .../convert-entities-in-element/input.html    |   2 +-
 .../output-v2.json                            |  27 ---
 .../samples/convert-entities/input-v2.html    |   1 -
 .../samples/convert-entities/input.html       |   2 +-
 .../samples/convert-entities/output-v2.json   |  18 --
 .../samples/css-ref-selector/input-v2.html    |   7 -
 .../samples/css-ref-selector/input.html       |   2 +-
 .../samples/css-ref-selector/output-v2.json   |  96 ---------
 test/parser/samples/css/input-v2.html         |   7 -
 test/parser/samples/css/input.html            |   2 +-
 test/parser/samples/css/output-v2.json        |  96 ---------
 .../samples/dynamic-import/input-v2.html      |   9 -
 .../samples/dynamic-import/output-v2.json     | 182 ------------------
 .../each-block-destructured/input-v2.html     |   3 -
 .../each-block-destructured/input.html        |   6 +-
 .../each-block-destructured/output-v2.json    |  67 -------
 .../each-block-destructured/output.json       |  34 ++--
 .../samples/each-block-else/input-v2.html     |   5 -
 .../parser/samples/each-block-else/input.html |   8 +-
 .../samples/each-block-else/output-v2.json    |  68 -------
 .../samples/each-block-else/output.json       |  34 ++--
 .../samples/each-block-indexed/input-v2.html  |   3 -
 .../samples/each-block-indexed/input.html     |   6 +-
 .../samples/each-block-indexed/output-v2.json |  64 ------
 .../samples/each-block-indexed/output.json    |  34 ++--
 .../samples/each-block-keyed/input-v2.html    |   3 -
 .../samples/each-block-keyed/input.html       |   6 +-
 .../samples/each-block-keyed/output-v2.json   |  47 -----
 .../samples/each-block-keyed/output.json      |  18 +-
 test/parser/samples/each-block/input-v2.html  |   3 -
 test/parser/samples/each-block/input.html     |   6 +-
 test/parser/samples/each-block/output-v2.json |  46 -----
 test/parser/samples/each-block/output.json    |  22 +--
 .../element-with-mustache/input-v2.html       |   1 -
 .../samples/element-with-mustache/input.html  |   2 +-
 .../element-with-mustache/output-v2.json      |  44 -----
 .../samples/element-with-mustache/output.json |  14 +-
 .../samples/element-with-text/input-v2.html   |   1 -
 .../samples/element-with-text/input.html      |   2 +-
 .../samples/element-with-text/output-v2.json  |  27 ---
 test/parser/samples/elements/input-v2.html    |   1 -
 test/parser/samples/elements/input.html       |   2 +-
 test/parser/samples/elements/output-v2.json   |  28 ---
 .../error-binding-disabled/error-v2.json      |   9 -
 .../error-binding-disabled/input-v2.html      |   1 -
 .../samples/error-binding-disabled/input.html |   2 +-
 .../error-binding-mustaches/error-v2.json     |   9 -
 .../error-binding-mustaches/error.json        |   2 +-
 .../error-binding-mustaches/input-v2.html     |   1 -
 .../error-binding-mustaches/input.html        |   2 +-
 .../error-binding-rvalue/error-v2.json        |   9 -
 .../error-binding-rvalue/input-v2.html        |   1 -
 .../error-comment-unclosed/error-v2.json      |   9 -
 .../error-comment-unclosed/input-v2.html      |   1 -
 .../samples/error-comment-unclosed/input.html |   2 +-
 test/parser/samples/error-css/error-v2.json   |   9 -
 test/parser/samples/error-css/input-v2.html   |   3 -
 .../samples/error-event-handler/error-v2.json |   9 -
 .../samples/error-event-handler/input-v2.html |   1 -
 .../error-illegal-expression/error-v2.json    |   9 -
 .../error-illegal-expression/error.json       |   4 +-
 .../error-illegal-expression/input-v2.html    |   1 -
 .../error-illegal-expression/input.html       |   2 +-
 .../error-multiple-styles/error-v2.json       |   9 -
 .../error-multiple-styles/input-v2.html       |  13 --
 .../samples/error-multiple-styles/input.html  |   2 +-
 .../samples/error-ref-value/error-v2.json     |   9 -
 .../samples/error-ref-value/input-v2.html     |   1 -
 .../error-script-unclosed/error-v2.json       |   9 -
 .../samples/error-script-unclosed/error.json  |   2 +-
 .../error-script-unclosed/input-v2.html       |   3 -
 .../samples/error-script-unclosed/input.html  |   2 +-
 .../error-self-reference/error-v2.json        |   9 -
 .../samples/error-self-reference/error.json   |   2 +-
 .../error-self-reference/input-v2.html        |   1 -
 .../samples/error-self-reference/input.html   |   2 +-
 .../error-v2.json                             |   9 -
 .../input-v2.html                             |   1 -
 .../input.html                                |   2 +-
 .../error-v2.json                             |   9 -
 .../input-v2.html                             |   1 -
 .../input.html                                |   2 +-
 .../error-v2.json                             |   9 -
 .../input-v2.html                             |   2 -
 .../input.html                                |   2 +-
 .../error-v2.json                             |   9 -
 .../input-v2.html                             |   1 -
 .../error-unexpected-end-of-input/input.html  |   2 +-
 .../error-unmatched-closing-tag/error-v2.json |   9 -
 .../error-unmatched-closing-tag/input-v2.html |   1 -
 .../samples/error-void-closing/error-v2.json  |   9 -
 .../samples/error-void-closing/input-v2.html  |   1 -
 .../samples/error-void-closing/input.html     |   2 +-
 .../error-window-children/error-v2.json       |   9 -
 .../samples/error-window-children/error.json  |   6 +-
 .../error-window-children/input-v2.html       |   1 -
 .../samples/error-window-children/input.html  |   2 +-
 .../error-window-duplicate/error-v2.json      |   9 -
 .../samples/error-window-duplicate/error.json |   4 +-
 .../error-window-duplicate/input-v2.html      |   2 -
 .../samples/error-window-duplicate/input.html |   4 +-
 .../error-window-inside-block/error-v2.json   |   9 -
 .../error-window-inside-block/error.json      |   4 +-
 .../error-window-inside-block/input-v2.html   |   3 -
 .../error-window-inside-block/input.html      |   6 +-
 .../error-window-inside-element/error-v2.json |   9 -
 .../error-window-inside-element/error.json    |   2 +-
 .../error-window-inside-element/input-v2.html |   3 -
 .../error-window-inside-element/input.html    |   2 +-
 .../samples/event-handler/input-v2.html       |   5 -
 test/parser/samples/event-handler/input.html  |   4 +-
 .../samples/event-handler/output-v2.json      | 116 -----------
 test/parser/samples/event-handler/output.json |  18 +-
 .../samples/if-block-else/input-v2.html       |   5 -
 test/parser/samples/if-block-else/input.html  |   6 +-
 .../samples/if-block-else/output-v2.json      |  62 ------
 test/parser/samples/if-block-else/output.json |  30 +--
 .../samples/if-block-elseif/input-v2.html     |   5 -
 .../parser/samples/if-block-elseif/input.html |   6 +-
 .../samples/if-block-elseif/output-v2.json    | 102 ----------
 .../samples/if-block-elseif/output.json       |  54 +++---
 test/parser/samples/if-block/input-v2.html    |   1 -
 test/parser/samples/if-block/input.html       |   2 +-
 test/parser/samples/if-block/output-v2.json   |  31 ---
 test/parser/samples/if-block/output.json      |  14 +-
 .../implicitly-closed-li/input-v2.html        |   5 -
 .../implicitly-closed-li/output-v2.json       |  72 -------
 test/parser/samples/nbsp/input-v2.html        |   1 -
 test/parser/samples/nbsp/output-v2.json       |  27 ---
 .../samples/raw-mustaches/input-v2.html       |   1 -
 test/parser/samples/raw-mustaches/input.html  |   2 +-
 .../samples/raw-mustaches/output-v2.json      |  61 ------
 test/parser/samples/raw-mustaches/output.json |  28 +--
 test/parser/samples/refs/input-v2.html        |   1 -
 test/parser/samples/refs/input.html           |   2 +-
 test/parser/samples/refs/output-v2.json       |  27 ---
 .../samples/script-comment-only/input-v2.html |   5 -
 .../samples/script-comment-only/input.html    |   2 +-
 .../script-comment-only/output-v2.json        |  26 ---
 .../input-v2.html                             |  13 --
 .../input.html                                |   2 +-
 .../output-v2.json                            | 128 ------------
 .../output.json                               |  64 +++---
 .../script-comment-trailing/input-v2.html     |  11 --
 .../script-comment-trailing/input.html        |   2 +-
 .../script-comment-trailing/output-v2.json    | 128 ------------
 .../script-comment-trailing/output.json       |  64 +++---
 test/parser/samples/script/input-v2.html      |   9 -
 test/parser/samples/script/input.html         |   2 +-
 test/parser/samples/script/output-v2.json     | 128 ------------
 test/parser/samples/script/output.json        |  64 +++---
 .../self-closing-element/input-v2.html        |   1 -
 .../samples/self-closing-element/input.html   |   2 +-
 .../self-closing-element/output-v2.json       |  20 --
 .../samples/self-reference/input-v2.html      |   3 -
 test/parser/samples/self-reference/input.html |   6 +-
 .../samples/self-reference/output-v2.json     |  79 --------
 .../parser/samples/self-reference/output.json |  40 ++--
 .../space-between-mustaches/input-v2.html     |   1 -
 .../space-between-mustaches/input.html        |   2 +-
 .../space-between-mustaches/output-v2.json    |  78 --------
 .../space-between-mustaches/output.json       |  40 ++--
 test/parser/samples/spread/input-v2.html      |   1 -
 test/parser/samples/spread/input.html         |   2 +-
 test/parser/samples/spread/output-v2.json     |  32 ---
 test/parser/samples/spread/output.json        |  14 +-
 .../samples/textarea-children/input-v2.html   |   3 -
 .../samples/textarea-children/input.html      |   2 +-
 .../samples/textarea-children/output-v2.json  |  44 -----
 .../samples/textarea-children/output.json     |  16 +-
 .../transition-intro-no-params/input-v2.html  |   1 -
 .../transition-intro-no-params/output-v2.json |  37 ----
 .../samples/transition-intro/input-v2.html    |   1 -
 .../samples/transition-intro/output-v2.json   |  65 -------
 .../samples/unusual-identifier/input-v2.html  |   3 -
 .../samples/unusual-identifier/input.html     |   6 +-
 .../samples/unusual-identifier/output-v2.json |  46 -----
 .../samples/unusual-identifier/output.json    |  22 +--
 .../whitespace-leading-trailing/input-v2.html |   3 -
 .../whitespace-leading-trailing/input.html    |   2 +-
 .../output-v2.json                            |  33 ----
 .../samples/whitespace-normal/input-v2.html   |   1 -
 .../samples/whitespace-normal/input.html      |   2 +-
 .../samples/whitespace-normal/output-v2.json  |  68 -------
 .../samples/whitespace-normal/output.json     |  26 +--
 test/parser/samples/yield/input-v2.html       |   1 -
 test/parser/samples/yield/input.html          |   2 +-
 test/parser/samples/yield/output-v2.json      |  23 ---
 test/parser/samples/yield/output.json         |  17 +-
 249 files changed, 555 insertions(+), 3996 deletions(-)
 delete mode 100644 test/parser/samples/action-with-call/input-v2.html
 delete mode 100644 test/parser/samples/action-with-call/output-v2.json
 delete mode 100644 test/parser/samples/action-with-identifier/input-v2.html
 delete mode 100644 test/parser/samples/action-with-identifier/output-v2.json
 delete mode 100644 test/parser/samples/action-with-literal/input-v2.html
 delete mode 100644 test/parser/samples/action-with-literal/output-v2.json
 delete mode 100644 test/parser/samples/action/input-v2.html
 delete mode 100644 test/parser/samples/action/output-v2.json
 delete mode 100644 test/parser/samples/attribute-dynamic-boolean/input-v2.html
 delete mode 100644 test/parser/samples/attribute-dynamic-boolean/output-v2.json
 delete mode 100644 test/parser/samples/attribute-dynamic-reserved/input-v2.html
 delete mode 100644 test/parser/samples/attribute-dynamic-reserved/output-v2.json
 delete mode 100644 test/parser/samples/attribute-dynamic/input-v2.html
 delete mode 100644 test/parser/samples/attribute-dynamic/output-v2.json
 delete mode 100644 test/parser/samples/attribute-escaped/input-v2.html
 delete mode 100644 test/parser/samples/attribute-escaped/output-v2.json
 delete mode 100644 test/parser/samples/attribute-multiple/input-v2.html
 delete mode 100644 test/parser/samples/attribute-multiple/output-v2.json
 delete mode 100644 test/parser/samples/attribute-shorthand/input-v2.html
 delete mode 100644 test/parser/samples/attribute-shorthand/output-v2.json
 delete mode 100644 test/parser/samples/attribute-static-boolean/input-v2.html
 delete mode 100644 test/parser/samples/attribute-static-boolean/output-v2.json
 delete mode 100644 test/parser/samples/attribute-static/input-v2.html
 delete mode 100644 test/parser/samples/attribute-static/output-v2.json
 delete mode 100644 test/parser/samples/attribute-unique-error/error-v2.json
 delete mode 100644 test/parser/samples/attribute-unique-error/input-v2.html
 delete mode 100644 test/parser/samples/attribute-unquoted/input-v2.html
 delete mode 100644 test/parser/samples/attribute-unquoted/output-v2.json
 delete mode 100644 test/parser/samples/await-then-catch/input-v2.html
 delete mode 100644 test/parser/samples/await-then-catch/output-v2.json
 delete mode 100644 test/parser/samples/binding-shorthand/input-v2.html
 delete mode 100644 test/parser/samples/binding-shorthand/output-v2.json
 delete mode 100644 test/parser/samples/binding/input-v2.html
 delete mode 100644 test/parser/samples/binding/output-v2.json
 delete mode 100644 test/parser/samples/comment/input-v2.html
 delete mode 100644 test/parser/samples/comment/output-v2.json
 delete mode 100644 test/parser/samples/component-dynamic/input-v2.html
 delete mode 100644 test/parser/samples/component-dynamic/output-v2.json
 delete mode 100644 test/parser/samples/convert-entities-in-element/input-v2.html
 delete mode 100644 test/parser/samples/convert-entities-in-element/output-v2.json
 delete mode 100644 test/parser/samples/convert-entities/input-v2.html
 delete mode 100644 test/parser/samples/convert-entities/output-v2.json
 delete mode 100644 test/parser/samples/css-ref-selector/input-v2.html
 delete mode 100644 test/parser/samples/css-ref-selector/output-v2.json
 delete mode 100644 test/parser/samples/css/input-v2.html
 delete mode 100644 test/parser/samples/css/output-v2.json
 delete mode 100644 test/parser/samples/dynamic-import/input-v2.html
 delete mode 100644 test/parser/samples/dynamic-import/output-v2.json
 delete mode 100644 test/parser/samples/each-block-destructured/input-v2.html
 delete mode 100644 test/parser/samples/each-block-destructured/output-v2.json
 delete mode 100644 test/parser/samples/each-block-else/input-v2.html
 delete mode 100644 test/parser/samples/each-block-else/output-v2.json
 delete mode 100644 test/parser/samples/each-block-indexed/input-v2.html
 delete mode 100644 test/parser/samples/each-block-indexed/output-v2.json
 delete mode 100644 test/parser/samples/each-block-keyed/input-v2.html
 delete mode 100644 test/parser/samples/each-block-keyed/output-v2.json
 delete mode 100644 test/parser/samples/each-block/input-v2.html
 delete mode 100644 test/parser/samples/each-block/output-v2.json
 delete mode 100644 test/parser/samples/element-with-mustache/input-v2.html
 delete mode 100644 test/parser/samples/element-with-mustache/output-v2.json
 delete mode 100644 test/parser/samples/element-with-text/input-v2.html
 delete mode 100644 test/parser/samples/element-with-text/output-v2.json
 delete mode 100644 test/parser/samples/elements/input-v2.html
 delete mode 100644 test/parser/samples/elements/output-v2.json
 delete mode 100644 test/parser/samples/error-binding-disabled/error-v2.json
 delete mode 100644 test/parser/samples/error-binding-disabled/input-v2.html
 delete mode 100644 test/parser/samples/error-binding-mustaches/error-v2.json
 delete mode 100644 test/parser/samples/error-binding-mustaches/input-v2.html
 delete mode 100644 test/parser/samples/error-binding-rvalue/error-v2.json
 delete mode 100644 test/parser/samples/error-binding-rvalue/input-v2.html
 delete mode 100644 test/parser/samples/error-comment-unclosed/error-v2.json
 delete mode 100644 test/parser/samples/error-comment-unclosed/input-v2.html
 delete mode 100644 test/parser/samples/error-css/error-v2.json
 delete mode 100644 test/parser/samples/error-css/input-v2.html
 delete mode 100644 test/parser/samples/error-event-handler/error-v2.json
 delete mode 100644 test/parser/samples/error-event-handler/input-v2.html
 delete mode 100644 test/parser/samples/error-illegal-expression/error-v2.json
 delete mode 100644 test/parser/samples/error-illegal-expression/input-v2.html
 delete mode 100644 test/parser/samples/error-multiple-styles/error-v2.json
 delete mode 100644 test/parser/samples/error-multiple-styles/input-v2.html
 delete mode 100644 test/parser/samples/error-ref-value/error-v2.json
 delete mode 100644 test/parser/samples/error-ref-value/input-v2.html
 delete mode 100644 test/parser/samples/error-script-unclosed/error-v2.json
 delete mode 100644 test/parser/samples/error-script-unclosed/input-v2.html
 delete mode 100644 test/parser/samples/error-self-reference/error-v2.json
 delete mode 100644 test/parser/samples/error-self-reference/input-v2.html
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input-b/input-v2.html
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input-c/input-v2.html
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input-d/input-v2.html
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input/error-v2.json
 delete mode 100644 test/parser/samples/error-unexpected-end-of-input/input-v2.html
 delete mode 100644 test/parser/samples/error-unmatched-closing-tag/error-v2.json
 delete mode 100644 test/parser/samples/error-unmatched-closing-tag/input-v2.html
 delete mode 100644 test/parser/samples/error-void-closing/error-v2.json
 delete mode 100644 test/parser/samples/error-void-closing/input-v2.html
 delete mode 100644 test/parser/samples/error-window-children/error-v2.json
 delete mode 100644 test/parser/samples/error-window-children/input-v2.html
 delete mode 100644 test/parser/samples/error-window-duplicate/error-v2.json
 delete mode 100644 test/parser/samples/error-window-duplicate/input-v2.html
 delete mode 100644 test/parser/samples/error-window-inside-block/error-v2.json
 delete mode 100644 test/parser/samples/error-window-inside-block/input-v2.html
 delete mode 100644 test/parser/samples/error-window-inside-element/error-v2.json
 delete mode 100644 test/parser/samples/error-window-inside-element/input-v2.html
 delete mode 100644 test/parser/samples/event-handler/input-v2.html
 delete mode 100644 test/parser/samples/event-handler/output-v2.json
 delete mode 100644 test/parser/samples/if-block-else/input-v2.html
 delete mode 100644 test/parser/samples/if-block-else/output-v2.json
 delete mode 100644 test/parser/samples/if-block-elseif/input-v2.html
 delete mode 100644 test/parser/samples/if-block-elseif/output-v2.json
 delete mode 100644 test/parser/samples/if-block/input-v2.html
 delete mode 100644 test/parser/samples/if-block/output-v2.json
 delete mode 100644 test/parser/samples/implicitly-closed-li/input-v2.html
 delete mode 100644 test/parser/samples/implicitly-closed-li/output-v2.json
 delete mode 100644 test/parser/samples/nbsp/input-v2.html
 delete mode 100644 test/parser/samples/nbsp/output-v2.json
 delete mode 100644 test/parser/samples/raw-mustaches/input-v2.html
 delete mode 100644 test/parser/samples/raw-mustaches/output-v2.json
 delete mode 100644 test/parser/samples/refs/input-v2.html
 delete mode 100644 test/parser/samples/refs/output-v2.json
 delete mode 100644 test/parser/samples/script-comment-only/input-v2.html
 delete mode 100644 test/parser/samples/script-comment-only/output-v2.json
 delete mode 100644 test/parser/samples/script-comment-trailing-multiline/input-v2.html
 delete mode 100644 test/parser/samples/script-comment-trailing-multiline/output-v2.json
 delete mode 100644 test/parser/samples/script-comment-trailing/input-v2.html
 delete mode 100644 test/parser/samples/script-comment-trailing/output-v2.json
 delete mode 100644 test/parser/samples/script/input-v2.html
 delete mode 100644 test/parser/samples/script/output-v2.json
 delete mode 100644 test/parser/samples/self-closing-element/input-v2.html
 delete mode 100644 test/parser/samples/self-closing-element/output-v2.json
 delete mode 100644 test/parser/samples/self-reference/input-v2.html
 delete mode 100644 test/parser/samples/self-reference/output-v2.json
 delete mode 100644 test/parser/samples/space-between-mustaches/input-v2.html
 delete mode 100644 test/parser/samples/space-between-mustaches/output-v2.json
 delete mode 100644 test/parser/samples/spread/input-v2.html
 delete mode 100644 test/parser/samples/spread/output-v2.json
 delete mode 100644 test/parser/samples/textarea-children/input-v2.html
 delete mode 100644 test/parser/samples/textarea-children/output-v2.json
 delete mode 100644 test/parser/samples/transition-intro-no-params/input-v2.html
 delete mode 100644 test/parser/samples/transition-intro-no-params/output-v2.json
 delete mode 100644 test/parser/samples/transition-intro/input-v2.html
 delete mode 100644 test/parser/samples/transition-intro/output-v2.json
 delete mode 100644 test/parser/samples/unusual-identifier/input-v2.html
 delete mode 100644 test/parser/samples/unusual-identifier/output-v2.json
 delete mode 100644 test/parser/samples/whitespace-leading-trailing/input-v2.html
 delete mode 100644 test/parser/samples/whitespace-leading-trailing/output-v2.json
 delete mode 100644 test/parser/samples/whitespace-normal/input-v2.html
 delete mode 100644 test/parser/samples/whitespace-normal/output-v2.json
 delete mode 100644 test/parser/samples/yield/input-v2.html
 delete mode 100644 test/parser/samples/yield/output-v2.json

diff --git a/test/parser/index.js b/test/parser/index.js
index 06383b975f..ee49ee8509 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -2,7 +2,7 @@ import assert from 'assert';
 import fs from 'fs';
 import { svelte, tryToLoadJson } from '../helpers.js';
 
-describe('parse', () => {
+describe.only('parse', () => {
 	fs.readdirSync('test/parser/samples').forEach(dir => {
 		if (dir[0] === '.') return;
 
@@ -18,48 +18,35 @@ describe('parse', () => {
 		(solo ? it.only : it)(dir, () => {
 			const options = tryToLoadJson(`test/parser/samples/${dir}/options.json`) || {};
 
-			function test(options, input, expectedOutput, expectedError, outputFile) {
+			options.parser = 'v2'; // TODO remove
+
+			const input = fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8').replace(/\s+$/, '');
+			const expectedOutput = tryToLoadJson(`test/parser/samples/${dir}/output.json`);
+			const expectedError = tryToLoadJson(`test/parser/samples/${dir}/error.json`);
+
+			try {
+				const actual = svelte.parse(input, options);
+
+				fs.writeFileSync(`test/parser/samples/${dir}/_actual.json`, JSON.stringify(actual, null, '\t'));
+
+				assert.deepEqual(actual.html, expectedOutput.html);
+				assert.deepEqual(actual.css, expectedOutput.css);
+				assert.deepEqual(actual.js, expectedOutput.js);
+			} catch (err) {
+				if (err.name !== 'ParseError') throw err;
+				if (!expectedError) throw err;
+
 				try {
-					const actual = svelte.parse(input, options);
-
-					fs.writeFileSync(outputFile, JSON.stringify(actual, null, '\t'));
-
-					assert.deepEqual(actual.html, expectedOutput.html);
-					assert.deepEqual(actual.css, expectedOutput.css);
-					assert.deepEqual(actual.js, expectedOutput.js);
-				} catch (err) {
-					if (err.name !== 'ParseError') throw err;
-					if (!expectedError) throw err;
-
-					try {
-						assert.equal(err.code, expectedError.code);
-						assert.equal(err.message, expectedError.message);
-						assert.deepEqual(err.loc, expectedError.loc);
-						assert.equal(err.pos, expectedError.pos);
-						assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.loc.line}:${expectedError.loc.column})`);
-					} catch (err2) {
-						const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
-						throw e;
-					}
+					assert.equal(err.code, expectedError.code);
+					assert.equal(err.message, expectedError.message);
+					assert.deepEqual(err.loc, expectedError.loc);
+					assert.equal(err.pos, expectedError.pos);
+					assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.loc.line}:${expectedError.loc.column})`);
+				} catch (err2) {
+					const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
+					throw e;
 				}
 			}
-
-			// TODO remove v1 tests
-			test(
-				options,
-				fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8').replace(/\s+$/, ''),
-				tryToLoadJson(`test/parser/samples/${dir}/output.json`),
-				tryToLoadJson(`test/parser/samples/${dir}/error.json`),
-				`test/parser/samples/${dir}/_actual.json`
-			);
-
-			test(
-				Object.assign({ parser: 'v2' }, options),
-				fs.readFileSync(`test/parser/samples/${dir}/input-v2.html`, 'utf-8').replace(/\s+$/, ''),
-				tryToLoadJson(`test/parser/samples/${dir}/output-v2.json`),
-				tryToLoadJson(`test/parser/samples/${dir}/error-v2.json`),
-				`test/parser/samples/${dir}/_actual-v2.json`
-			);
 		});
 	});
 
diff --git a/test/parser/samples/action-with-call/input-v2.html b/test/parser/samples/action-with-call/input-v2.html
deleted file mode 100644
index 246bf02c59..0000000000
--- a/test/parser/samples/action-with-call/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input use:tooltip="t('tooltip msg')">
diff --git a/test/parser/samples/action-with-call/output-v2.json b/test/parser/samples/action-with-call/output-v2.json
deleted file mode 100644
index f5cc6824f3..0000000000
--- a/test/parser/samples/action-with-call/output-v2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"hash": 1937205193,
-	"html": {
-		"start": 0,
-		"end": 38,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 38,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 37,
-						"type": "Action",
-						"name": "tooltip",
-						"expression": {
-							"type": "CallExpression",
-							"start": 20,
-							"end": 36,
-							"callee": {
-								"type": "Identifier",
-								"start": 20,
-								"end": 21,
-								"name": "t"
-							},
-							"arguments": [
-								{
-									"type": "Literal",
-									"start": 22,
-									"end": 35,
-									"value": "tooltip msg",
-									"raw": "'tooltip msg'"
-								}
-							]
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-identifier/input-v2.html b/test/parser/samples/action-with-identifier/input-v2.html
deleted file mode 100644
index 14a65e83ed..0000000000
--- a/test/parser/samples/action-with-identifier/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input use:tooltip="message">
diff --git a/test/parser/samples/action-with-identifier/output-v2.json b/test/parser/samples/action-with-identifier/output-v2.json
deleted file mode 100644
index 6c39ed94bc..0000000000
--- a/test/parser/samples/action-with-identifier/output-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": 1937205193,
-	"html": {
-		"start": 0,
-		"end": 29,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 29,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 28,
-						"type": "Action",
-						"name": "tooltip",
-						"expression": {
-							"type": "Identifier",
-							"start": 20,
-							"end": 27,
-							"name": "message"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-literal/input-v2.html b/test/parser/samples/action-with-literal/input-v2.html
deleted file mode 100644
index 60e16eacfc..0000000000
--- a/test/parser/samples/action-with-literal/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input use:tooltip="'tooltip msg'">
diff --git a/test/parser/samples/action-with-literal/output-v2.json b/test/parser/samples/action-with-literal/output-v2.json
deleted file mode 100644
index 0da0318887..0000000000
--- a/test/parser/samples/action-with-literal/output-v2.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"hash": 1937205193,
-	"html": {
-		"start": 0,
-		"end": 35,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 35,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 34,
-						"type": "Action",
-						"name": "tooltip",
-						"expression": {
-							"type": "Literal",
-							"start": 20,
-							"end": 33,
-							"value": "tooltip msg",
-							"raw": "'tooltip msg'"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/action/input-v2.html b/test/parser/samples/action/input-v2.html
deleted file mode 100644
index 64409c2a65..0000000000
--- a/test/parser/samples/action/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input use:autofocus>
diff --git a/test/parser/samples/action/output-v2.json b/test/parser/samples/action/output-v2.json
deleted file mode 100644
index 597ae297a5..0000000000
--- a/test/parser/samples/action/output-v2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"hash": 1937205193,
-	"html": {
-		"start": 0,
-		"end": 21,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 21,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 20,
-						"type": "Action",
-						"name": "autofocus",
-						"expression": null
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/input-v2.html b/test/parser/samples/attribute-dynamic-boolean/input-v2.html
deleted file mode 100644
index ba531f2f81..0000000000
--- a/test/parser/samples/attribute-dynamic-boolean/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<textarea readonly={readonly}></textarea>
diff --git a/test/parser/samples/attribute-dynamic-boolean/input.html b/test/parser/samples/attribute-dynamic-boolean/input.html
index 59683fecb1..ba531f2f81 100644
--- a/test/parser/samples/attribute-dynamic-boolean/input.html
+++ b/test/parser/samples/attribute-dynamic-boolean/input.html
@@ -1 +1 @@
-<textarea readonly='{{readonly}}'></textarea>
+<textarea readonly={readonly}></textarea>
diff --git a/test/parser/samples/attribute-dynamic-boolean/output-v2.json b/test/parser/samples/attribute-dynamic-boolean/output-v2.json
deleted file mode 100644
index 4d08df34a0..0000000000
--- a/test/parser/samples/attribute-dynamic-boolean/output-v2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"hash": "7xolfv",
-	"html": {
-		"start": 0,
-		"end": 41,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 41,
-				"type": "Element",
-				"name": "textarea",
-				"attributes": [
-					{
-						"start": 10,
-						"end": 29,
-						"type": "Attribute",
-						"name": "readonly",
-						"value": [
-							{
-								"start": 19,
-								"end": 29,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 20,
-									"end": 28,
-									"name": "readonly"
-								}
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/output.json b/test/parser/samples/attribute-dynamic-boolean/output.json
index af1635a55d..4d08df34a0 100644
--- a/test/parser/samples/attribute-dynamic-boolean/output.json
+++ b/test/parser/samples/attribute-dynamic-boolean/output.json
@@ -1,30 +1,30 @@
 {
-	"hash": 3179574701,
+	"hash": "7xolfv",
 	"html": {
 		"start": 0,
-		"end": 45,
+		"end": 41,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 45,
+				"end": 41,
 				"type": "Element",
 				"name": "textarea",
 				"attributes": [
 					{
 						"start": 10,
-						"end": 33,
+						"end": 29,
 						"type": "Attribute",
 						"name": "readonly",
 						"value": [
 							{
-								"start": 20,
-								"end": 32,
+								"start": 19,
+								"end": 29,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 22,
-									"end": 30,
+									"start": 20,
+									"end": 28,
 									"name": "readonly"
 								}
 							}
diff --git a/test/parser/samples/attribute-dynamic-reserved/input-v2.html b/test/parser/samples/attribute-dynamic-reserved/input-v2.html
deleted file mode 100644
index d973a9dea0..0000000000
--- a/test/parser/samples/attribute-dynamic-reserved/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class={class}></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/input.html b/test/parser/samples/attribute-dynamic-reserved/input.html
index 6b149d165f..d973a9dea0 100644
--- a/test/parser/samples/attribute-dynamic-reserved/input.html
+++ b/test/parser/samples/attribute-dynamic-reserved/input.html
@@ -1 +1 @@
-<div class='{{class}}'></div>
\ No newline at end of file
+<div class={class}></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/output-v2.json b/test/parser/samples/attribute-dynamic-reserved/output-v2.json
deleted file mode 100644
index 4b6506b0cd..0000000000
--- a/test/parser/samples/attribute-dynamic-reserved/output-v2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"hash": "l0cddf",
-	"html": {
-		"start": 0,
-		"end": 25,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 25,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 18,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 11,
-								"end": 18,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 12,
-									"end": 17,
-									"name": "class"
-								}
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/output.json b/test/parser/samples/attribute-dynamic-reserved/output.json
index aef0e5cb63..4b6506b0cd 100644
--- a/test/parser/samples/attribute-dynamic-reserved/output.json
+++ b/test/parser/samples/attribute-dynamic-reserved/output.json
@@ -1,30 +1,30 @@
 {
-	"hash": 2788845841,
+	"hash": "l0cddf",
 	"html": {
 		"start": 0,
-		"end": 29,
+		"end": 25,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 29,
+				"end": 25,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 22,
+						"end": 18,
 						"type": "Attribute",
 						"name": "class",
 						"value": [
 							{
-								"start": 12,
-								"end": 21,
+								"start": 11,
+								"end": 18,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 14,
-									"end": 19,
+									"start": 12,
+									"end": 17,
 									"name": "class"
 								}
 							}
diff --git a/test/parser/samples/attribute-dynamic/input-v2.html b/test/parser/samples/attribute-dynamic/input-v2.html
deleted file mode 100644
index 9171ae22a7..0000000000
--- a/test/parser/samples/attribute-dynamic/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style='color: {color};'>{color}</div>
diff --git a/test/parser/samples/attribute-dynamic/input.html b/test/parser/samples/attribute-dynamic/input.html
index 84a34b91ff..9171ae22a7 100644
--- a/test/parser/samples/attribute-dynamic/input.html
+++ b/test/parser/samples/attribute-dynamic/input.html
@@ -1 +1 @@
-<div style='color: {{color}};'>{{color}}</div>
+<div style='color: {color};'>{color}</div>
diff --git a/test/parser/samples/attribute-dynamic/output-v2.json b/test/parser/samples/attribute-dynamic/output-v2.json
deleted file mode 100644
index 7ccb40d313..0000000000
--- a/test/parser/samples/attribute-dynamic/output-v2.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-	"hash": "ehtsx6",
-	"html": {
-		"start": 0,
-		"end": 42,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 42,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 28,
-						"type": "Attribute",
-						"name": "style",
-						"value": [
-							{
-								"start": 12,
-								"end": 19,
-								"type": "Text",
-								"data": "color: "
-							},
-							{
-								"start": 19,
-								"end": 26,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 20,
-									"end": 25,
-									"name": "color"
-								}
-							},
-							{
-								"start": 26,
-								"end": 27,
-								"type": "Text",
-								"data": ";"
-							}
-						]
-					}
-				],
-				"children": [
-					{
-						"start": 29,
-						"end": 36,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 30,
-							"end": 35,
-							"name": "color"
-						}
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic/output.json b/test/parser/samples/attribute-dynamic/output.json
index 79ef81065f..7ccb40d313 100644
--- a/test/parser/samples/attribute-dynamic/output.json
+++ b/test/parser/samples/attribute-dynamic/output.json
@@ -1,19 +1,19 @@
 {
-	"hash": 804348386,
+	"hash": "ehtsx6",
 	"html": {
 		"start": 0,
-		"end": 46,
+		"end": 42,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 46,
+				"end": 42,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 30,
+						"end": 28,
 						"type": "Attribute",
 						"name": "style",
 						"value": [
@@ -25,18 +25,18 @@
 							},
 							{
 								"start": 19,
-								"end": 28,
+								"end": 26,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 21,
-									"end": 26,
+									"start": 20,
+									"end": 25,
 									"name": "color"
 								}
 							},
 							{
-								"start": 28,
-								"end": 29,
+								"start": 26,
+								"end": 27,
 								"type": "Text",
 								"data": ";"
 							}
@@ -45,13 +45,13 @@
 				],
 				"children": [
 					{
-						"start": 31,
-						"end": 40,
+						"start": 29,
+						"end": 36,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 33,
-							"end": 38,
+							"start": 30,
+							"end": 35,
 							"name": "color"
 						}
 					}
diff --git a/test/parser/samples/attribute-escaped/input-v2.html b/test/parser/samples/attribute-escaped/input-v2.html
deleted file mode 100644
index 82186dcee4..0000000000
--- a/test/parser/samples/attribute-escaped/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div data-foo='&quot;quoted&quot;'></div>
diff --git a/test/parser/samples/attribute-escaped/output-v2.json b/test/parser/samples/attribute-escaped/output-v2.json
deleted file mode 100644
index 974084bcdd..0000000000
--- a/test/parser/samples/attribute-escaped/output-v2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"hash": 1563956934,
-	"html": {
-		"start": 0,
-		"end": 41,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 41,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 34,
-						"type": "Attribute",
-						"name": "data-foo",
-						"value": [
-							{
-								"start": 15,
-								"end": 33,
-								"type": "Text",
-								"data": "\"quoted\""
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/input-v2.html b/test/parser/samples/attribute-multiple/input-v2.html
deleted file mode 100644
index 6f61bd6289..0000000000
--- a/test/parser/samples/attribute-multiple/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div id='x' class='y'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/input.html b/test/parser/samples/attribute-multiple/input.html
index a5adf38f2c..6f61bd6289 100644
--- a/test/parser/samples/attribute-multiple/input.html
+++ b/test/parser/samples/attribute-multiple/input.html
@@ -1 +1 @@
-<div id='x' class='y'></div>
+<div id='x' class='y'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/output-v2.json b/test/parser/samples/attribute-multiple/output-v2.json
deleted file mode 100644
index 81af977b51..0000000000
--- a/test/parser/samples/attribute-multiple/output-v2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-	"hash": 507039402,
-	"html": {
-		"start": 0,
-		"end": 28,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 28,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 11,
-						"type": "Attribute",
-						"name": "id",
-						"value": [
-							{
-								"start": 9,
-								"end": 10,
-								"type": "Text",
-								"data": "x"
-							}
-						]
-					},
-					{
-						"start": 12,
-						"end": 21,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 19,
-								"end": 20,
-								"type": "Text",
-								"data": "y"
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/input-v2.html b/test/parser/samples/attribute-shorthand/input-v2.html
deleted file mode 100644
index 35468de006..0000000000
--- a/test/parser/samples/attribute-shorthand/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div {id}/>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/input.html b/test/parser/samples/attribute-shorthand/input.html
index e26deafb3a..35468de006 100644
--- a/test/parser/samples/attribute-shorthand/input.html
+++ b/test/parser/samples/attribute-shorthand/input.html
@@ -1 +1 @@
-<div :id/>
\ No newline at end of file
+<div {id}/>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/output-v2.json b/test/parser/samples/attribute-shorthand/output-v2.json
deleted file mode 100644
index 598356350b..0000000000
--- a/test/parser/samples/attribute-shorthand/output-v2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"hash": 1705925892,
-	"html": {
-		"start": 0,
-		"end": 11,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 11,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 9,
-						"type": "Attribute",
-						"name": "id",
-						"value": [
-							{
-								"type": "AttributeShorthand",
-								"start": 6,
-								"end": 8,
-								"expression": {
-									"type": "Identifier",
-									"start": 6,
-									"end": 8,
-									"name": "id"
-								}
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/output.json b/test/parser/samples/attribute-shorthand/output.json
index b6578c13eb..598356350b 100644
--- a/test/parser/samples/attribute-shorthand/output.json
+++ b/test/parser/samples/attribute-shorthand/output.json
@@ -2,18 +2,18 @@
 	"hash": 1705925892,
 	"html": {
 		"start": 0,
-		"end": 10,
+		"end": 11,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 10,
+				"end": 11,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 8,
+						"end": 9,
 						"type": "Attribute",
 						"name": "id",
 						"value": [
diff --git a/test/parser/samples/attribute-static-boolean/input-v2.html b/test/parser/samples/attribute-static-boolean/input-v2.html
deleted file mode 100644
index 1536f3e1e8..0000000000
--- a/test/parser/samples/attribute-static-boolean/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<textarea readonly></textarea>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/input.html b/test/parser/samples/attribute-static-boolean/input.html
index 3ca3bfd9a8..1536f3e1e8 100644
--- a/test/parser/samples/attribute-static-boolean/input.html
+++ b/test/parser/samples/attribute-static-boolean/input.html
@@ -1 +1 @@
-<textarea readonly></textarea>
+<textarea readonly></textarea>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/output-v2.json b/test/parser/samples/attribute-static-boolean/output-v2.json
deleted file mode 100644
index 21429893fd..0000000000
--- a/test/parser/samples/attribute-static-boolean/output-v2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"hash": 606864228,
-	"html": {
-		"start": 0,
-		"end": 30,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 30,
-				"type": "Element",
-				"name": "textarea",
-				"attributes": [
-					{
-						"start": 10,
-						"end": 18,
-						"type": "Attribute",
-						"name": "readonly",
-						"value": true
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/input-v2.html b/test/parser/samples/attribute-static/input-v2.html
deleted file mode 100644
index c6a8a8c95d..0000000000
--- a/test/parser/samples/attribute-static/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class='foo'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/input.html b/test/parser/samples/attribute-static/input.html
index 3cb2e4b233..c6a8a8c95d 100644
--- a/test/parser/samples/attribute-static/input.html
+++ b/test/parser/samples/attribute-static/input.html
@@ -1 +1 @@
-<div class='foo'></div>
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/output-v2.json b/test/parser/samples/attribute-static/output-v2.json
deleted file mode 100644
index 394f95f458..0000000000
--- a/test/parser/samples/attribute-static/output-v2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"hash": 1493227373,
-	"html": {
-		"start": 0,
-		"end": 23,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 23,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 16,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 12,
-								"end": 15,
-								"type": "Text",
-								"data": "foo"
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unique-error/error-v2.json b/test/parser/samples/attribute-unique-error/error-v2.json
deleted file mode 100644
index 737157b246..0000000000
--- a/test/parser/samples/attribute-unique-error/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "duplicate-attribute",
-	"message": "Attributes need to be unique",
-	"loc": {
-		"line": 1,
-		"column": 17
-	},
-	"pos": 17
-}
diff --git a/test/parser/samples/attribute-unique-error/input-v2.html b/test/parser/samples/attribute-unique-error/input-v2.html
deleted file mode 100644
index 37fec733b3..0000000000
--- a/test/parser/samples/attribute-unique-error/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class='foo' class='bar'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unique-error/input.html b/test/parser/samples/attribute-unique-error/input.html
index 4088350ce0..37fec733b3 100644
--- a/test/parser/samples/attribute-unique-error/input.html
+++ b/test/parser/samples/attribute-unique-error/input.html
@@ -1 +1 @@
-<div class='foo' class='bar'></div>
+<div class='foo' class='bar'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/input-v2.html b/test/parser/samples/attribute-unquoted/input-v2.html
deleted file mode 100644
index 4bab0df72f..0000000000
--- a/test/parser/samples/attribute-unquoted/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class=foo></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/input.html b/test/parser/samples/attribute-unquoted/input.html
index 2d388456d0..4bab0df72f 100644
--- a/test/parser/samples/attribute-unquoted/input.html
+++ b/test/parser/samples/attribute-unquoted/input.html
@@ -1 +1 @@
-<div class=foo></div>
+<div class=foo></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/output-v2.json b/test/parser/samples/attribute-unquoted/output-v2.json
deleted file mode 100644
index 474d925b2e..0000000000
--- a/test/parser/samples/attribute-unquoted/output-v2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"hash": 3488539025,
-	"html": {
-		"start": 0,
-		"end": 21,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 21,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 14,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 11,
-								"end": 14,
-								"type": "Text",
-								"data": "foo"
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/input-v2.html b/test/parser/samples/await-then-catch/input-v2.html
deleted file mode 100644
index 79f5162ace..0000000000
--- a/test/parser/samples/await-then-catch/input-v2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{#await thePromise}
-	<p>loading...</p>
-{:then theValue}
-	<p>the value is {theValue}</p>
-{:catch theError}
-	<p>oh no! {theError.message}</p>
-{/await}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/input.html b/test/parser/samples/await-then-catch/input.html
index 36489b9043..79f5162ace 100644
--- a/test/parser/samples/await-then-catch/input.html
+++ b/test/parser/samples/await-then-catch/input.html
@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
\ No newline at end of file
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/output-v2.json b/test/parser/samples/await-then-catch/output-v2.json
deleted file mode 100644
index 22ad4242e3..0000000000
--- a/test/parser/samples/await-then-catch/output-v2.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	"hash": "1b28gs9",
-	"html": {
-		"start": 0,
-		"end": 148,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 148,
-				"type": "AwaitBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 8,
-					"end": 18,
-					"name": "thePromise"
-				},
-				"value": "theValue",
-				"error": "theError",
-				"pending": {
-					"start": 19,
-					"end": 39,
-					"type": "PendingBlock",
-					"children": [
-						{
-							"start": 19,
-							"end": 21,
-							"type": "Text",
-							"data": "\n\t"
-						},
-						{
-							"start": 21,
-							"end": 38,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 24,
-									"end": 34,
-									"type": "Text",
-									"data": "loading..."
-								}
-							]
-						},
-						{
-							"start": 38,
-							"end": 39,
-							"type": "Text",
-							"data": "\n"
-						}
-					]
-				},
-				"then": {
-					"start": 39,
-					"end": 88,
-					"type": "ThenBlock",
-					"children": [
-						{
-							"start": 55,
-							"end": 57,
-							"type": "Text",
-							"data": "\n\t"
-						},
-						{
-							"start": 57,
-							"end": 87,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 60,
-									"end": 73,
-									"type": "Text",
-									"data": "the value is "
-								},
-								{
-									"start": 73,
-									"end": 83,
-									"type": "MustacheTag",
-									"expression": {
-										"type": "Identifier",
-										"start": 74,
-										"end": 82,
-										"name": "theValue"
-									}
-								}
-							]
-						},
-						{
-							"start": 87,
-							"end": 88,
-							"type": "Text",
-							"data": "\n"
-						}
-					]
-				},
-				"catch": {
-					"start": 88,
-					"end": 140,
-					"type": "CatchBlock",
-					"children": [
-						{
-							"start": 105,
-							"end": 107,
-							"type": "Text",
-							"data": "\n\t"
-						},
-						{
-							"start": 107,
-							"end": 139,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 110,
-									"end": 117,
-									"type": "Text",
-									"data": "oh no! "
-								},
-								{
-									"start": 117,
-									"end": 135,
-									"type": "MustacheTag",
-									"expression": {
-										"type": "MemberExpression",
-										"start": 118,
-										"end": 134,
-										"object": {
-											"type": "Identifier",
-											"start": 118,
-											"end": 126,
-											"name": "theError"
-										},
-										"property": {
-											"type": "Identifier",
-											"start": 127,
-											"end": 134,
-											"name": "message"
-										},
-										"computed": false
-									}
-								}
-							]
-						},
-						{
-							"start": 139,
-							"end": 140,
-							"type": "Text",
-							"data": "\n"
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/output.json b/test/parser/samples/await-then-catch/output.json
index 4f149e6a0c..22ad4242e3 100644
--- a/test/parser/samples/await-then-catch/output.json
+++ b/test/parser/samples/await-then-catch/output.json
@@ -1,143 +1,143 @@
 {
-	"hash": 1040536517,
+	"hash": "1b28gs9",
 	"html": {
 		"start": 0,
-		"end": 158,
+		"end": 148,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 158,
+				"end": 148,
 				"type": "AwaitBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 9,
-					"end": 19,
+					"start": 8,
+					"end": 18,
 					"name": "thePromise"
 				},
 				"value": "theValue",
 				"error": "theError",
 				"pending": {
-					"start": 21,
-					"end": 41,
+					"start": 19,
+					"end": 39,
 					"type": "PendingBlock",
 					"children": [
 						{
-							"start": 21,
-							"end": 23,
+							"start": 19,
+							"end": 21,
 							"type": "Text",
 							"data": "\n\t"
 						},
 						{
-							"start": 23,
-							"end": 40,
+							"start": 21,
+							"end": 38,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 26,
-									"end": 36,
+									"start": 24,
+									"end": 34,
 									"type": "Text",
 									"data": "loading..."
 								}
 							]
 						},
 						{
-							"start": 40,
-							"end": 41,
+							"start": 38,
+							"end": 39,
 							"type": "Text",
 							"data": "\n"
 						}
 					]
 				},
 				"then": {
-					"start": 41,
-					"end": 93,
+					"start": 39,
+					"end": 88,
 					"type": "ThenBlock",
 					"children": [
 						{
-							"start": 58,
-							"end": 60,
+							"start": 55,
+							"end": 57,
 							"type": "Text",
 							"data": "\n\t"
 						},
 						{
-							"start": 60,
-							"end": 92,
+							"start": 57,
+							"end": 87,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 63,
-									"end": 76,
+									"start": 60,
+									"end": 73,
 									"type": "Text",
 									"data": "the value is "
 								},
 								{
-									"start": 76,
-									"end": 88,
+									"start": 73,
+									"end": 83,
 									"type": "MustacheTag",
 									"expression": {
 										"type": "Identifier",
-										"start": 78,
-										"end": 86,
+										"start": 74,
+										"end": 82,
 										"name": "theValue"
 									}
 								}
 							]
 						},
 						{
-							"start": 92,
-							"end": 93,
+							"start": 87,
+							"end": 88,
 							"type": "Text",
 							"data": "\n"
 						}
 					]
 				},
 				"catch": {
-					"start": 93,
-					"end": 148,
+					"start": 88,
+					"end": 140,
 					"type": "CatchBlock",
 					"children": [
 						{
-							"start": 111,
-							"end": 113,
+							"start": 105,
+							"end": 107,
 							"type": "Text",
 							"data": "\n\t"
 						},
 						{
-							"start": 113,
-							"end": 147,
+							"start": 107,
+							"end": 139,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 116,
-									"end": 123,
+									"start": 110,
+									"end": 117,
 									"type": "Text",
 									"data": "oh no! "
 								},
 								{
-									"start": 123,
-									"end": 143,
+									"start": 117,
+									"end": 135,
 									"type": "MustacheTag",
 									"expression": {
 										"type": "MemberExpression",
-										"start": 125,
-										"end": 141,
+										"start": 118,
+										"end": 134,
 										"object": {
 											"type": "Identifier",
-											"start": 125,
-											"end": 133,
+											"start": 118,
+											"end": 126,
 											"name": "theError"
 										},
 										"property": {
 											"type": "Identifier",
-											"start": 134,
-											"end": 141,
+											"start": 127,
+											"end": 134,
 											"name": "message"
 										},
 										"computed": false
@@ -146,8 +146,8 @@
 							]
 						},
 						{
-							"start": 147,
-							"end": 148,
+							"start": 139,
+							"end": 140,
 							"type": "Text",
 							"data": "\n"
 						}
diff --git a/test/parser/samples/binding-shorthand/input-v2.html b/test/parser/samples/binding-shorthand/input-v2.html
deleted file mode 100644
index 7f8116bdde..0000000000
--- a/test/parser/samples/binding-shorthand/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<Widget bind:foo/>
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/input.html b/test/parser/samples/binding-shorthand/input.html
index 31f9c872b0..7f8116bdde 100644
--- a/test/parser/samples/binding-shorthand/input.html
+++ b/test/parser/samples/binding-shorthand/input.html
@@ -1 +1 @@
-<Widget bind:foo/>
+<Widget bind:foo/>
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/output-v2.json b/test/parser/samples/binding-shorthand/output-v2.json
deleted file mode 100644
index 8a7b615cf4..0000000000
--- a/test/parser/samples/binding-shorthand/output-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": 3088875001,
-	"html": {
-		"start": 0,
-		"end": 18,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 18,
-				"type": "Element",
-				"name": "Widget",
-				"attributes": [
-					{
-						"start": 8,
-						"end": 16,
-						"type": "Binding",
-						"name": "foo",
-						"value": {
-							"type": "Identifier",
-							"start": 13,
-							"end": 16,
-							"name": "foo"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/binding/input-v2.html b/test/parser/samples/binding/input-v2.html
deleted file mode 100644
index 3af20a9ced..0000000000
--- a/test/parser/samples/binding/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value='name'>
\ No newline at end of file
diff --git a/test/parser/samples/binding/input.html b/test/parser/samples/binding/input.html
index 6a7bf8566c..3af20a9ced 100644
--- a/test/parser/samples/binding/input.html
+++ b/test/parser/samples/binding/input.html
@@ -1 +1 @@
-<input bind:value='name'>
+<input bind:value='name'>
\ No newline at end of file
diff --git a/test/parser/samples/binding/output-v2.json b/test/parser/samples/binding/output-v2.json
deleted file mode 100644
index 74f2059f59..0000000000
--- a/test/parser/samples/binding/output-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": 1937205193,
-	"html": {
-		"start": 0,
-		"end": 25,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 25,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 24,
-						"type": "Binding",
-						"name": "value",
-						"value": {
-							"type": "Identifier",
-							"start": 19,
-							"end": 23,
-							"name": "name"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/comment/input-v2.html b/test/parser/samples/comment/input-v2.html
deleted file mode 100644
index 3b3ffe3222..0000000000
--- a/test/parser/samples/comment/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- a comment -->
\ No newline at end of file
diff --git a/test/parser/samples/comment/input.html b/test/parser/samples/comment/input.html
index b35c49dac8..3b3ffe3222 100644
--- a/test/parser/samples/comment/input.html
+++ b/test/parser/samples/comment/input.html
@@ -1 +1 @@
-<!-- a comment -->
+<!-- a comment -->
\ No newline at end of file
diff --git a/test/parser/samples/comment/output-v2.json b/test/parser/samples/comment/output-v2.json
deleted file mode 100644
index e77c968b6b..0000000000
--- a/test/parser/samples/comment/output-v2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"hash": 3294612990,
-	"html": {
-		"start": 0,
-		"end": 18,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 18,
-				"type": "Comment",
-				"data": " a comment "
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/input-v2.html b/test/parser/samples/component-dynamic/input-v2.html
deleted file mode 100644
index 1dad5eb269..0000000000
--- a/test/parser/samples/component-dynamic/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<svelte:component this="{foo ? Foo : Bar}"></svelte:component>
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/input.html b/test/parser/samples/component-dynamic/input.html
index 0d5be48552..1dad5eb269 100644
--- a/test/parser/samples/component-dynamic/input.html
+++ b/test/parser/samples/component-dynamic/input.html
@@ -1 +1 @@
-<:Component {foo ? Foo : Bar}></:Component>
\ No newline at end of file
+<svelte:component this="{foo ? Foo : Bar}"></svelte:component>
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/output-v2.json b/test/parser/samples/component-dynamic/output-v2.json
deleted file mode 100644
index 604103ea14..0000000000
--- a/test/parser/samples/component-dynamic/output-v2.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"hash": "2u5ec3",
-	"html": {
-		"start": 0,
-		"end": 62,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 62,
-				"type": "Element",
-				"name": "svelte:component",
-				"attributes": [],
-				"children": [],
-				"expression": {
-					"type": "ConditionalExpression",
-					"start": 25,
-					"end": 40,
-					"test": {
-						"type": "Identifier",
-						"start": 25,
-						"end": 28,
-						"name": "foo"
-					},
-					"consequent": {
-						"type": "Identifier",
-						"start": 31,
-						"end": 34,
-						"name": "Foo"
-					},
-					"alternate": {
-						"type": "Identifier",
-						"start": 37,
-						"end": 40,
-						"name": "Bar"
-					}
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/output.json b/test/parser/samples/component-dynamic/output.json
index 614c28c0a9..604103ea14 100644
--- a/test/parser/samples/component-dynamic/output.json
+++ b/test/parser/samples/component-dynamic/output.json
@@ -1,37 +1,37 @@
 {
-	"hash": 410218696,
+	"hash": "2u5ec3",
 	"html": {
 		"start": 0,
-		"end": 43,
+		"end": 62,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 43,
+				"end": 62,
 				"type": "Element",
-				"name": ":Component",
+				"name": "svelte:component",
 				"attributes": [],
 				"children": [],
 				"expression": {
 					"type": "ConditionalExpression",
-					"start": 13,
-					"end": 28,
+					"start": 25,
+					"end": 40,
 					"test": {
 						"type": "Identifier",
-						"start": 13,
-						"end": 16,
+						"start": 25,
+						"end": 28,
 						"name": "foo"
 					},
 					"consequent": {
 						"type": "Identifier",
-						"start": 19,
-						"end": 22,
+						"start": 31,
+						"end": 34,
 						"name": "Foo"
 					},
 					"alternate": {
 						"type": "Identifier",
-						"start": 25,
-						"end": 28,
+						"start": 37,
+						"end": 40,
 						"name": "Bar"
 					}
 				}
diff --git a/test/parser/samples/convert-entities-in-element/input-v2.html b/test/parser/samples/convert-entities-in-element/input-v2.html
deleted file mode 100644
index f05dc391ad..0000000000
--- a/test/parser/samples/convert-entities-in-element/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Hello &amp; World</p>
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/input.html b/test/parser/samples/convert-entities-in-element/input.html
index bc5c086536..f05dc391ad 100644
--- a/test/parser/samples/convert-entities-in-element/input.html
+++ b/test/parser/samples/convert-entities-in-element/input.html
@@ -1 +1 @@
-<p>Hello &amp; World</p>
+<p>Hello &amp; World</p>
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/output-v2.json b/test/parser/samples/convert-entities-in-element/output-v2.json
deleted file mode 100644
index cb3e50ec3b..0000000000
--- a/test/parser/samples/convert-entities-in-element/output-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": 2365862121,
-	"html": {
-		"start": 0,
-		"end": 24,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 24,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 3,
-						"end": 20,
-						"type": "Text",
-						"data": "Hello & World"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/input-v2.html b/test/parser/samples/convert-entities/input-v2.html
deleted file mode 100644
index 161463ec58..0000000000
--- a/test/parser/samples/convert-entities/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello &amp; World
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/input.html b/test/parser/samples/convert-entities/input.html
index e25e3214f2..161463ec58 100644
--- a/test/parser/samples/convert-entities/input.html
+++ b/test/parser/samples/convert-entities/input.html
@@ -1 +1 @@
-Hello &amp; World
+Hello &amp; World
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/output-v2.json b/test/parser/samples/convert-entities/output-v2.json
deleted file mode 100644
index 479bae3064..0000000000
--- a/test/parser/samples/convert-entities/output-v2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"hash": 156753432,
-	"html": {
-		"start": 0,
-		"end": 17,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 17,
-				"type": "Text",
-				"data": "Hello & World"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/input-v2.html b/test/parser/samples/css-ref-selector/input-v2.html
deleted file mode 100644
index 696075f93f..0000000000
--- a/test/parser/samples/css-ref-selector/input-v2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div ref:foo/>
-
-<style>
-	ref:foo {
-		color: red;
-	}
-</style>
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/input.html b/test/parser/samples/css-ref-selector/input.html
index 07ab3790f7..696075f93f 100644
--- a/test/parser/samples/css-ref-selector/input.html
+++ b/test/parser/samples/css-ref-selector/input.html
@@ -4,4 +4,4 @@
 	ref:foo {
 		color: red;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/output-v2.json b/test/parser/samples/css-ref-selector/output-v2.json
deleted file mode 100644
index 2ddafc4aae..0000000000
--- a/test/parser/samples/css-ref-selector/output-v2.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-	"hash": 1104014177,
-	"html": {
-		"start": 0,
-		"end": 14,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 14,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 12,
-						"type": "Ref",
-						"name": "foo"
-					}
-				],
-				"children": []
-			},
-			{
-				"start": 14,
-				"end": 16,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": {
-		"start": 16,
-		"end": 60,
-		"attributes": [],
-		"children": [
-			{
-				"type": "Rule",
-				"selector": {
-					"type": "SelectorList",
-					"children": [
-						{
-							"type": "Selector",
-							"children": [
-								{
-									"type": "RefSelector",
-									"start": 25,
-									"end": 32,
-									"name": "foo"
-								}
-							],
-							"start": 25,
-							"end": 32
-						}
-					],
-					"start": 25,
-					"end": 32
-				},
-				"block": {
-					"type": "Block",
-					"children": [
-						{
-							"type": "Declaration",
-							"important": false,
-							"property": "color",
-							"value": {
-								"type": "Value",
-								"children": [
-									{
-										"type": "Identifier",
-										"name": "red",
-										"start": 44,
-										"end": 47
-									}
-								],
-								"start": 43,
-								"end": 47
-							},
-							"start": 37,
-							"end": 47
-						}
-					],
-					"start": 33,
-					"end": 51
-				},
-				"start": 25,
-				"end": 51
-			}
-		],
-		"content": {
-			"start": 23,
-			"end": 52,
-			"styles": "\n\tref:foo {\n\t\tcolor: red;\n\t}\n"
-		}
-	},
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/css/input-v2.html b/test/parser/samples/css/input-v2.html
deleted file mode 100644
index a573bcf778..0000000000
--- a/test/parser/samples/css/input-v2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>foo</div>
-
-<style>
-	div {
-		color: red;
-	}
-</style>
\ No newline at end of file
diff --git a/test/parser/samples/css/input.html b/test/parser/samples/css/input.html
index 659c4343f6..a573bcf778 100644
--- a/test/parser/samples/css/input.html
+++ b/test/parser/samples/css/input.html
@@ -4,4 +4,4 @@
 	div {
 		color: red;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/css/output-v2.json b/test/parser/samples/css/output-v2.json
deleted file mode 100644
index 4650ccea46..0000000000
--- a/test/parser/samples/css/output-v2.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-	"hash": 1147407419,
-	"html": {
-		"start": 0,
-		"end": 14,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 14,
-				"type": "Element",
-				"name": "div",
-				"attributes": [],
-				"children": [
-					{
-						"start": 5,
-						"end": 8,
-						"type": "Text",
-						"data": "foo"
-					}
-				]
-			},
-			{
-				"start": 14,
-				"end": 16,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": {
-		"start": 16,
-		"end": 56,
-		"attributes": [],
-		"children": [
-			{
-				"type": "Rule",
-				"selector": {
-					"type": "SelectorList",
-					"children": [
-						{
-							"type": "Selector",
-							"children": [
-								{
-									"type": "TypeSelector",
-									"name": "div",
-									"start": 25,
-									"end": 28
-								}
-							],
-							"start": 25,
-							"end": 28
-						}
-					],
-					"start": 25,
-					"end": 28
-				},
-				"block": {
-					"type": "Block",
-					"children": [
-						{
-							"type": "Declaration",
-							"important": false,
-							"property": "color",
-							"value": {
-								"type": "Value",
-								"children": [
-									{
-										"type": "Identifier",
-										"name": "red",
-										"start": 40,
-										"end": 43
-									}
-								],
-								"start": 39,
-								"end": 43
-							},
-							"start": 33,
-							"end": 43
-						}
-					],
-					"start": 29,
-					"end": 47
-				},
-				"start": 25,
-				"end": 47
-			}
-		],
-		"content": {
-			"start": 23,
-			"end": 48,
-			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
-		}
-	},
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/input-v2.html b/test/parser/samples/dynamic-import/input-v2.html
deleted file mode 100644
index 553ca6c38c..0000000000
--- a/test/parser/samples/dynamic-import/input-v2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	export default {
-		oncreate() {
-			import('./foo.js').then(foo => {
-				console.log(foo.default);
-			});
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/output-v2.json b/test/parser/samples/dynamic-import/output-v2.json
deleted file mode 100644
index b27a780a58..0000000000
--- a/test/parser/samples/dynamic-import/output-v2.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-	"hash": 1867472549,
-	"html": {
-		"start": null,
-		"end": null,
-		"type": "Fragment",
-		"children": []
-	},
-	"css": null,
-	"js": {
-		"start": 0,
-		"end": 131,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 8,
-			"end": 122,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 10,
-					"end": 121,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 25,
-						"end": 121,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 29,
-								"end": 118,
-								"method": true,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 29,
-									"end": 37,
-									"name": "oncreate"
-								},
-								"kind": "init",
-								"value": {
-									"type": "FunctionExpression",
-									"start": 37,
-									"end": 118,
-									"id": null,
-									"generator": false,
-									"expression": false,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "BlockStatement",
-										"start": 40,
-										"end": 118,
-										"body": [
-											{
-												"type": "ExpressionStatement",
-												"start": 45,
-												"end": 114,
-												"expression": {
-													"type": "CallExpression",
-													"start": 45,
-													"end": 113,
-													"callee": {
-														"type": "MemberExpression",
-														"start": 45,
-														"end": 68,
-														"object": {
-															"type": "CallExpression",
-															"start": 45,
-															"end": 63,
-															"callee": {
-																"type": "Import",
-																"start": 45,
-																"end": 51
-															},
-															"arguments": [
-																{
-																	"type": "Literal",
-																	"start": 52,
-																	"end": 62,
-																	"value": "./foo.js",
-																	"raw": "'./foo.js'"
-																}
-															]
-														},
-														"property": {
-															"type": "Identifier",
-															"start": 64,
-															"end": 68,
-															"name": "then"
-														},
-														"computed": false
-													},
-													"arguments": [
-														{
-															"type": "ArrowFunctionExpression",
-															"start": 69,
-															"end": 112,
-															"id": null,
-															"generator": false,
-															"expression": false,
-															"async": false,
-															"params": [
-																{
-																	"type": "Identifier",
-																	"start": 69,
-																	"end": 72,
-																	"name": "foo"
-																}
-															],
-															"body": {
-																"type": "BlockStatement",
-																"start": 76,
-																"end": 112,
-																"body": [
-																	{
-																		"type": "ExpressionStatement",
-																		"start": 82,
-																		"end": 107,
-																		"expression": {
-																			"type": "CallExpression",
-																			"start": 82,
-																			"end": 106,
-																			"callee": {
-																				"type": "MemberExpression",
-																				"start": 82,
-																				"end": 93,
-																				"object": {
-																					"type": "Identifier",
-																					"start": 82,
-																					"end": 89,
-																					"name": "console"
-																				},
-																				"property": {
-																					"type": "Identifier",
-																					"start": 90,
-																					"end": 93,
-																					"name": "log"
-																				},
-																				"computed": false
-																			},
-																			"arguments": [
-																				{
-																					"type": "MemberExpression",
-																					"start": 94,
-																					"end": 105,
-																					"object": {
-																						"type": "Identifier",
-																						"start": 94,
-																						"end": 97,
-																						"name": "foo"
-																					},
-																					"property": {
-																						"type": "Identifier",
-																						"start": 98,
-																						"end": 105,
-																						"name": "default"
-																					},
-																					"computed": false
-																				}
-																			]
-																		}
-																	}
-																]
-															}
-														}
-													]
-												}
-											}
-										]
-									}
-								}
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-destructured/input-v2.html b/test/parser/samples/each-block-destructured/input-v2.html
deleted file mode 100644
index 4ddf33ef85..0000000000
--- a/test/parser/samples/each-block-destructured/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each animals as [key, value]}
-	<p>{key}: {value}</p>
-{/each}
diff --git a/test/parser/samples/each-block-destructured/input.html b/test/parser/samples/each-block-destructured/input.html
index 7209f5503d..4ddf33ef85 100644
--- a/test/parser/samples/each-block-destructured/input.html
+++ b/test/parser/samples/each-block-destructured/input.html
@@ -1,3 +1,3 @@
-{{#each animals as [key, value]}}
-	<p>{{key}}: {{value}}</p>
-{{/each}}
+{#each animals as [key, value]}
+	<p>{key}: {value}</p>
+{/each}
diff --git a/test/parser/samples/each-block-destructured/output-v2.json b/test/parser/samples/each-block-destructured/output-v2.json
deleted file mode 100644
index 38d5ddc770..0000000000
--- a/test/parser/samples/each-block-destructured/output-v2.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"hash": "gtdm5e",
-	"html": {
-		"start": 0,
-		"end": 62,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 62,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 33,
-						"end": 54,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 36,
-								"end": 41,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 37,
-									"end": 40,
-									"name": "key"
-								}
-							},
-							{
-								"start": 41,
-								"end": 43,
-								"type": "Text",
-								"data": ": "
-							},
-							{
-								"start": 43,
-								"end": 50,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 44,
-									"end": 49,
-									"name": "value"
-								}
-							}
-						]
-					}
-				],
-				"destructuredContexts": [
-					"key",
-					"value"
-				],
-				"context": "key_value"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-destructured/output.json b/test/parser/samples/each-block-destructured/output.json
index 897fec88b8..38d5ddc770 100644
--- a/test/parser/samples/each-block-destructured/output.json
+++ b/test/parser/samples/each-block-destructured/output.json
@@ -1,53 +1,53 @@
 {
-	"hash": 2621498076,
+	"hash": "gtdm5e",
 	"html": {
 		"start": 0,
-		"end": 70,
+		"end": 62,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 70,
+				"end": 62,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 35,
-						"end": 60,
+						"start": 33,
+						"end": 54,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 38,
-								"end": 45,
+								"start": 36,
+								"end": 41,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 40,
-									"end": 43,
+									"start": 37,
+									"end": 40,
 									"name": "key"
 								}
 							},
 							{
-								"start": 45,
-								"end": 47,
+								"start": 41,
+								"end": 43,
 								"type": "Text",
 								"data": ": "
 							},
 							{
-								"start": 47,
-								"end": 56,
+								"start": 43,
+								"end": 50,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 49,
-									"end": 54,
+									"start": 44,
+									"end": 49,
 									"name": "value"
 								}
 							}
diff --git a/test/parser/samples/each-block-else/input-v2.html b/test/parser/samples/each-block-else/input-v2.html
deleted file mode 100644
index dc96d8b946..0000000000
--- a/test/parser/samples/each-block-else/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{#each animals as animal}
-	<p>{animal}</p>
-{:else}
-	<p>no animals</p>
-{/each}
diff --git a/test/parser/samples/each-block-else/input.html b/test/parser/samples/each-block-else/input.html
index 59925e8db7..dc96d8b946 100644
--- a/test/parser/samples/each-block-else/input.html
+++ b/test/parser/samples/each-block-else/input.html
@@ -1,5 +1,5 @@
-{{#each animals as animal}}
-	<p>{{animal}}</p>
-{{else}}
+{#each animals as animal}
+	<p>{animal}</p>
+{:else}
 	<p>no animals</p>
-{{/each}}
+{/each}
diff --git a/test/parser/samples/each-block-else/output-v2.json b/test/parser/samples/each-block-else/output-v2.json
deleted file mode 100644
index 9f8c5da79b..0000000000
--- a/test/parser/samples/each-block-else/output-v2.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-	"hash": "ljl07n",
-	"html": {
-		"start": 0,
-		"end": 77,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 77,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 27,
-						"end": 42,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 30,
-								"end": 38,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 31,
-									"end": 37,
-									"name": "animal"
-								}
-							}
-						]
-					}
-				],
-				"context": "animal",
-				"else": {
-					"start": 50,
-					"end": 70,
-					"type": "ElseBlock",
-					"children": [
-						{
-							"start": 52,
-							"end": 69,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 55,
-									"end": 65,
-									"type": "Text",
-									"data": "no animals"
-								}
-							]
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-else/output.json b/test/parser/samples/each-block-else/output.json
index 0dadad5f65..9f8c5da79b 100644
--- a/test/parser/samples/each-block-else/output.json
+++ b/test/parser/samples/each-block-else/output.json
@@ -1,36 +1,36 @@
 {
-	"hash": 3238289871,
+	"hash": "ljl07n",
 	"html": {
 		"start": 0,
-		"end": 84,
+		"end": 77,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 84,
+				"end": 77,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 29,
-						"end": 46,
+						"start": 27,
+						"end": 42,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 32,
-								"end": 42,
+								"start": 30,
+								"end": 38,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 34,
-									"end": 40,
+									"start": 31,
+									"end": 37,
 									"name": "animal"
 								}
 							}
@@ -39,20 +39,20 @@
 				],
 				"context": "animal",
 				"else": {
-					"start": 55,
-					"end": 75,
+					"start": 50,
+					"end": 70,
 					"type": "ElseBlock",
 					"children": [
 						{
-							"start": 57,
-							"end": 74,
+							"start": 52,
+							"end": 69,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 60,
-									"end": 70,
+									"start": 55,
+									"end": 65,
 									"type": "Text",
 									"data": "no animals"
 								}
diff --git a/test/parser/samples/each-block-indexed/input-v2.html b/test/parser/samples/each-block-indexed/input-v2.html
deleted file mode 100644
index d5602ec82c..0000000000
--- a/test/parser/samples/each-block-indexed/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each animals as animal, i}
-	<p>{i}: {animal}</p>
-{/each}
diff --git a/test/parser/samples/each-block-indexed/input.html b/test/parser/samples/each-block-indexed/input.html
index 5c1c74da66..d5602ec82c 100644
--- a/test/parser/samples/each-block-indexed/input.html
+++ b/test/parser/samples/each-block-indexed/input.html
@@ -1,3 +1,3 @@
-{{#each animals as animal, i}}
-	<p>{{i}}: {{animal}}</p>
-{{/each}}
+{#each animals as animal, i}
+	<p>{i}: {animal}</p>
+{/each}
diff --git a/test/parser/samples/each-block-indexed/output-v2.json b/test/parser/samples/each-block-indexed/output-v2.json
deleted file mode 100644
index 9ffa02aaa8..0000000000
--- a/test/parser/samples/each-block-indexed/output-v2.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-	"hash": "1143n2g",
-	"html": {
-		"start": 0,
-		"end": 58,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 58,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 30,
-						"end": 50,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 33,
-								"end": 36,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 34,
-									"end": 35,
-									"name": "i"
-								}
-							},
-							{
-								"start": 36,
-								"end": 38,
-								"type": "Text",
-								"data": ": "
-							},
-							{
-								"start": 38,
-								"end": 46,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 39,
-									"end": 45,
-									"name": "animal"
-								}
-							}
-						]
-					}
-				],
-				"context": "animal",
-				"index": "i"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-indexed/output.json b/test/parser/samples/each-block-indexed/output.json
index fc8954d6ad..9ffa02aaa8 100644
--- a/test/parser/samples/each-block-indexed/output.json
+++ b/test/parser/samples/each-block-indexed/output.json
@@ -1,53 +1,53 @@
 {
-	"hash": 2841674990,
+	"hash": "1143n2g",
 	"html": {
 		"start": 0,
-		"end": 66,
+		"end": 58,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 66,
+				"end": 58,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 32,
-						"end": 56,
+						"start": 30,
+						"end": 50,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 35,
-								"end": 40,
+								"start": 33,
+								"end": 36,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 37,
-									"end": 38,
+									"start": 34,
+									"end": 35,
 									"name": "i"
 								}
 							},
 							{
-								"start": 40,
-								"end": 42,
+								"start": 36,
+								"end": 38,
 								"type": "Text",
 								"data": ": "
 							},
 							{
-								"start": 42,
-								"end": 52,
+								"start": 38,
+								"end": 46,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 44,
-									"end": 50,
+									"start": 39,
+									"end": 45,
 									"name": "animal"
 								}
 							}
diff --git a/test/parser/samples/each-block-keyed/input-v2.html b/test/parser/samples/each-block-keyed/input-v2.html
deleted file mode 100644
index 46348678d4..0000000000
--- a/test/parser/samples/each-block-keyed/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each todos as todo (todo.id)}
-	<p>{todo}</p>
-{/each}
diff --git a/test/parser/samples/each-block-keyed/input.html b/test/parser/samples/each-block-keyed/input.html
index 2bc79c9c8b..46348678d4 100644
--- a/test/parser/samples/each-block-keyed/input.html
+++ b/test/parser/samples/each-block-keyed/input.html
@@ -1,3 +1,3 @@
-{{#each todos as todo @id}}
-	<p>{{todo}}</p>
-{{/each}}
+{#each todos as todo (todo.id)}
+	<p>{todo}</p>
+{/each}
diff --git a/test/parser/samples/each-block-keyed/output-v2.json b/test/parser/samples/each-block-keyed/output-v2.json
deleted file mode 100644
index 461992347b..0000000000
--- a/test/parser/samples/each-block-keyed/output-v2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"hash": "1x6az5m",
-	"html": {
-		"start": 0,
-		"end": 54,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 54,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 12,
-					"name": "todos"
-				},
-				"children": [
-					{
-						"start": 33,
-						"end": 46,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 36,
-								"end": 42,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 37,
-									"end": 41,
-									"name": "todo"
-								}
-							}
-						]
-					}
-				],
-				"context": "todo",
-				"key": "id"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-keyed/output.json b/test/parser/samples/each-block-keyed/output.json
index 1a16afb82b..461992347b 100644
--- a/test/parser/samples/each-block-keyed/output.json
+++ b/test/parser/samples/each-block-keyed/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 2025411181,
+	"hash": "1x6az5m",
 	"html": {
 		"start": 0,
 		"end": 54,
@@ -11,26 +11,26 @@
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 13,
+					"start": 7,
+					"end": 12,
 					"name": "todos"
 				},
 				"children": [
 					{
-						"start": 29,
-						"end": 44,
+						"start": 33,
+						"end": 46,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 32,
-								"end": 40,
+								"start": 36,
+								"end": 42,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 34,
-									"end": 38,
+									"start": 37,
+									"end": 41,
 									"name": "todo"
 								}
 							}
diff --git a/test/parser/samples/each-block/input-v2.html b/test/parser/samples/each-block/input-v2.html
deleted file mode 100644
index 83a5e88ddd..0000000000
--- a/test/parser/samples/each-block/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each animals as animal}
-	<p>{animal}</p>
-{/each}
diff --git a/test/parser/samples/each-block/input.html b/test/parser/samples/each-block/input.html
index 23bfc3c465..83a5e88ddd 100644
--- a/test/parser/samples/each-block/input.html
+++ b/test/parser/samples/each-block/input.html
@@ -1,3 +1,3 @@
-{{#each animals as animal}}
-	<p>{{animal}}</p>
-{{/each}}
+{#each animals as animal}
+	<p>{animal}</p>
+{/each}
diff --git a/test/parser/samples/each-block/output-v2.json b/test/parser/samples/each-block/output-v2.json
deleted file mode 100644
index 7df4a20eba..0000000000
--- a/test/parser/samples/each-block/output-v2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"hash": "mzeq0s",
-	"html": {
-		"start": 0,
-		"end": 50,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 50,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 27,
-						"end": 42,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 30,
-								"end": 38,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 31,
-									"end": 37,
-									"name": "animal"
-								}
-							}
-						]
-					}
-				],
-				"context": "animal"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block/output.json b/test/parser/samples/each-block/output.json
index e549faca39..7df4a20eba 100644
--- a/test/parser/samples/each-block/output.json
+++ b/test/parser/samples/each-block/output.json
@@ -1,36 +1,36 @@
 {
-	"hash": 220340986,
+	"hash": "mzeq0s",
 	"html": {
 		"start": 0,
-		"end": 56,
+		"end": 50,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 56,
+				"end": 50,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 29,
-						"end": 46,
+						"start": 27,
+						"end": 42,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 32,
-								"end": 42,
+								"start": 30,
+								"end": 38,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 34,
-									"end": 40,
+									"start": 31,
+									"end": 37,
 									"name": "animal"
 								}
 							}
diff --git a/test/parser/samples/element-with-mustache/input-v2.html b/test/parser/samples/element-with-mustache/input-v2.html
deleted file mode 100644
index 1e9232da02..0000000000
--- a/test/parser/samples/element-with-mustache/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>hello {name}!</h1>
diff --git a/test/parser/samples/element-with-mustache/input.html b/test/parser/samples/element-with-mustache/input.html
index 6a2a43bf79..1e9232da02 100644
--- a/test/parser/samples/element-with-mustache/input.html
+++ b/test/parser/samples/element-with-mustache/input.html
@@ -1 +1 @@
-<h1>hello {{name}}!</h1>
+<h1>hello {name}!</h1>
diff --git a/test/parser/samples/element-with-mustache/output-v2.json b/test/parser/samples/element-with-mustache/output-v2.json
deleted file mode 100644
index 76e71dc327..0000000000
--- a/test/parser/samples/element-with-mustache/output-v2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"hash": 1265376132,
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-mustache/output.json b/test/parser/samples/element-with-mustache/output.json
index fd6799e192..76e71dc327 100644
--- a/test/parser/samples/element-with-mustache/output.json
+++ b/test/parser/samples/element-with-mustache/output.json
@@ -2,12 +2,12 @@
 	"hash": 1265376132,
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,18 +20,18 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
diff --git a/test/parser/samples/element-with-text/input-v2.html b/test/parser/samples/element-with-text/input-v2.html
deleted file mode 100644
index fcf3199655..0000000000
--- a/test/parser/samples/element-with-text/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<span>test</span>
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/input.html b/test/parser/samples/element-with-text/input.html
index 61dba8bc46..fcf3199655 100644
--- a/test/parser/samples/element-with-text/input.html
+++ b/test/parser/samples/element-with-text/input.html
@@ -1 +1 @@
-<span>test</span>
+<span>test</span>
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/output-v2.json b/test/parser/samples/element-with-text/output-v2.json
deleted file mode 100644
index 22cae35547..0000000000
--- a/test/parser/samples/element-with-text/output-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": 611274658,
-	"html": {
-		"start": 0,
-		"end": 17,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 17,
-				"type": "Element",
-				"name": "span",
-				"attributes": [],
-				"children": [
-					{
-						"start": 6,
-						"end": 10,
-						"type": "Text",
-						"data": "test"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/elements/input-v2.html b/test/parser/samples/elements/input-v2.html
deleted file mode 100644
index 937d25b42e..0000000000
--- a/test/parser/samples/elements/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<!doctype html>
\ No newline at end of file
diff --git a/test/parser/samples/elements/input.html b/test/parser/samples/elements/input.html
index c50eddd41f..937d25b42e 100644
--- a/test/parser/samples/elements/input.html
+++ b/test/parser/samples/elements/input.html
@@ -1 +1 @@
-<!doctype html>
+<!doctype html>
\ No newline at end of file
diff --git a/test/parser/samples/elements/output-v2.json b/test/parser/samples/elements/output-v2.json
deleted file mode 100644
index 7b4e6bffe1..0000000000
--- a/test/parser/samples/elements/output-v2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"hash": 825536165,
-	"html": {
-		"start": 0,
-		"end": 15,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 15,
-				"type": "Element",
-				"name": "!doctype",
-				"attributes": [
-					{
-						"start": 10,
-						"end": 14,
-						"type": "Attribute",
-						"name": "html",
-						"value": true
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-disabled/error-v2.json b/test/parser/samples/error-binding-disabled/error-v2.json
deleted file mode 100644
index 71953c4176..0000000000
--- a/test/parser/samples/error-binding-disabled/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "binding-disabled",
-	"message": "Two-way binding is disabled",
-	"loc": {
-		"line": 1,
-		"column": 7
-	},
-	"pos": 7
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-disabled/input-v2.html b/test/parser/samples/error-binding-disabled/input-v2.html
deleted file mode 100644
index 3af20a9ced..0000000000
--- a/test/parser/samples/error-binding-disabled/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value='name'>
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-disabled/input.html b/test/parser/samples/error-binding-disabled/input.html
index 6a7bf8566c..3af20a9ced 100644
--- a/test/parser/samples/error-binding-disabled/input.html
+++ b/test/parser/samples/error-binding-disabled/input.html
@@ -1 +1 @@
-<input bind:value='name'>
+<input bind:value='name'>
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/error-v2.json b/test/parser/samples/error-binding-mustaches/error-v2.json
deleted file mode 100644
index 4d23927086..0000000000
--- a/test/parser/samples/error-binding-mustaches/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "directive values should not be wrapped — use 'foo', not '{foo}'",
-	"loc": {
-		"line": 1,
-		"column": 19
-	},
-	"pos": 19
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/error.json b/test/parser/samples/error-binding-mustaches/error.json
index 0c4f9e01bd..4d23927086 100644
--- a/test/parser/samples/error-binding-mustaches/error.json
+++ b/test/parser/samples/error-binding-mustaches/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-directive-value",
-	"message": "directive values should not be wrapped — use 'foo', not '{{foo}}'",
+	"message": "directive values should not be wrapped — use 'foo', not '{foo}'",
 	"loc": {
 		"line": 1,
 		"column": 19
diff --git a/test/parser/samples/error-binding-mustaches/input-v2.html b/test/parser/samples/error-binding-mustaches/input-v2.html
deleted file mode 100644
index 2629696c9e..0000000000
--- a/test/parser/samples/error-binding-mustaches/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value='{foo}'>
diff --git a/test/parser/samples/error-binding-mustaches/input.html b/test/parser/samples/error-binding-mustaches/input.html
index a334ea7055..2629696c9e 100644
--- a/test/parser/samples/error-binding-mustaches/input.html
+++ b/test/parser/samples/error-binding-mustaches/input.html
@@ -1 +1 @@
-<input bind:value='{{foo}}'>
+<input bind:value='{foo}'>
diff --git a/test/parser/samples/error-binding-rvalue/error-v2.json b/test/parser/samples/error-binding-rvalue/error-v2.json
deleted file mode 100644
index b774b8a29f..0000000000
--- a/test/parser/samples/error-binding-rvalue/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
-	"pos": 19,
-	"loc": {
-		"line": 1,
-		"column": 19
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-rvalue/input-v2.html b/test/parser/samples/error-binding-rvalue/input-v2.html
deleted file mode 100644
index 0b1f716c23..0000000000
--- a/test/parser/samples/error-binding-rvalue/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value='a + b'>
\ No newline at end of file
diff --git a/test/parser/samples/error-comment-unclosed/error-v2.json b/test/parser/samples/error-comment-unclosed/error-v2.json
deleted file mode 100644
index d83ecbdc09..0000000000
--- a/test/parser/samples/error-comment-unclosed/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "unexpected-eof",
-	"message": "comment was left open, expected -->",
-	"loc": {
-		"line": 1,
-		"column": 24
-	},
-	"pos": 24
-}
diff --git a/test/parser/samples/error-comment-unclosed/input-v2.html b/test/parser/samples/error-comment-unclosed/input-v2.html
deleted file mode 100644
index fe6d748e1b..0000000000
--- a/test/parser/samples/error-comment-unclosed/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- an unclosed comment
\ No newline at end of file
diff --git a/test/parser/samples/error-comment-unclosed/input.html b/test/parser/samples/error-comment-unclosed/input.html
index 725cf9be60..fe6d748e1b 100644
--- a/test/parser/samples/error-comment-unclosed/input.html
+++ b/test/parser/samples/error-comment-unclosed/input.html
@@ -1 +1 @@
-<!-- an unclosed comment
+<!-- an unclosed comment
\ No newline at end of file
diff --git a/test/parser/samples/error-css/error-v2.json b/test/parser/samples/error-css/error-v2.json
deleted file mode 100644
index db6703b3d0..0000000000
--- a/test/parser/samples/error-css/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "css-syntax-error",
-	"message": "LeftCurlyBracket is expected",
-	"loc": {
-		"line": 2,
-		"column": 16
-	},
-	"pos": 24
-}
diff --git a/test/parser/samples/error-css/input-v2.html b/test/parser/samples/error-css/input-v2.html
deleted file mode 100644
index d073ec6258..0000000000
--- a/test/parser/samples/error-css/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<style>
-	this is not css
-</style>
\ No newline at end of file
diff --git a/test/parser/samples/error-event-handler/error-v2.json b/test/parser/samples/error-event-handler/error-v2.json
deleted file mode 100644
index 43be6e3951..0000000000
--- a/test/parser/samples/error-event-handler/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "Expected a method call",
-	"loc": {
-		"line": 1,
-		"column": 15
-	},
-	"pos": 15
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-event-handler/input-v2.html b/test/parser/samples/error-event-handler/input-v2.html
deleted file mode 100644
index 612b5ba399..0000000000
--- a/test/parser/samples/error-event-handler/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div on:click='foo'></div>
\ No newline at end of file
diff --git a/test/parser/samples/error-illegal-expression/error-v2.json b/test/parser/samples/error-illegal-expression/error-v2.json
deleted file mode 100644
index fdce2f1fb9..0000000000
--- a/test/parser/samples/error-illegal-expression/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "parse-error",
-	"message": "Assigning to rvalue",
-	"loc": {
-		"line": 1,
-		"column": 1
-	},
-	"pos": 1
-}
diff --git a/test/parser/samples/error-illegal-expression/error.json b/test/parser/samples/error-illegal-expression/error.json
index 345e313fb6..fdce2f1fb9 100644
--- a/test/parser/samples/error-illegal-expression/error.json
+++ b/test/parser/samples/error-illegal-expression/error.json
@@ -3,7 +3,7 @@
 	"message": "Assigning to rvalue",
 	"loc": {
 		"line": 1,
-		"column": 2
+		"column": 1
 	},
-	"pos": 2
+	"pos": 1
 }
diff --git a/test/parser/samples/error-illegal-expression/input-v2.html b/test/parser/samples/error-illegal-expression/input-v2.html
deleted file mode 100644
index 2d1cf18d2a..0000000000
--- a/test/parser/samples/error-illegal-expression/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-{42 = nope}
diff --git a/test/parser/samples/error-illegal-expression/input.html b/test/parser/samples/error-illegal-expression/input.html
index 8b020c7526..2d1cf18d2a 100644
--- a/test/parser/samples/error-illegal-expression/input.html
+++ b/test/parser/samples/error-illegal-expression/input.html
@@ -1 +1 @@
-{{42 = nope}}
+{42 = nope}
diff --git a/test/parser/samples/error-multiple-styles/error-v2.json b/test/parser/samples/error-multiple-styles/error-v2.json
deleted file mode 100644
index 937a37a1f3..0000000000
--- a/test/parser/samples/error-multiple-styles/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "duplicate-style",
-	"message": "You can only have one top-level <style> tag per component",
-	"loc": {
-		"line": 9,
-		"column": 0
-	},
-	"pos": 58
-}
diff --git a/test/parser/samples/error-multiple-styles/input-v2.html b/test/parser/samples/error-multiple-styles/input-v2.html
deleted file mode 100644
index d86e7824ff..0000000000
--- a/test/parser/samples/error-multiple-styles/input-v2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>foo</div>
-
-<style>
-	div {
-		color: red;
-	}
-</style>
-
-<style>
-	div {
-		color: blue;
-	}
-</style>
\ No newline at end of file
diff --git a/test/parser/samples/error-multiple-styles/input.html b/test/parser/samples/error-multiple-styles/input.html
index 720236a173..d86e7824ff 100644
--- a/test/parser/samples/error-multiple-styles/input.html
+++ b/test/parser/samples/error-multiple-styles/input.html
@@ -10,4 +10,4 @@
 	div {
 		color: blue;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/error-ref-value/error-v2.json b/test/parser/samples/error-ref-value/error-v2.json
deleted file mode 100644
index b5b83782ba..0000000000
--- a/test/parser/samples/error-ref-value/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "ref directives cannot have a value",
-	"loc": {
-		"line": 1,
-		"column": 14
-	},
-	"pos": 14
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-ref-value/input-v2.html b/test/parser/samples/error-ref-value/input-v2.html
deleted file mode 100644
index 8ad19958e3..0000000000
--- a/test/parser/samples/error-ref-value/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div ref:foo='bar'></div>
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/error-v2.json b/test/parser/samples/error-script-unclosed/error-v2.json
deleted file mode 100644
index 59c0415233..0000000000
--- a/test/parser/samples/error-script-unclosed/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "unclosed-script",
-	"message": "<script> must have a closing tag",
-	"loc": {
-		"line": 3,
-		"column": 8
-	},
-	"pos": 32
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/error.json b/test/parser/samples/error-script-unclosed/error.json
index a888682fcc..59c0415233 100644
--- a/test/parser/samples/error-script-unclosed/error.json
+++ b/test/parser/samples/error-script-unclosed/error.json
@@ -5,5 +5,5 @@
 		"line": 3,
 		"column": 8
 	},
-	"pos": 34
+	"pos": 32
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/input-v2.html b/test/parser/samples/error-script-unclosed/input-v2.html
deleted file mode 100644
index 133b653ef9..0000000000
--- a/test/parser/samples/error-script-unclosed/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Hello {name}!</h1>
-
-<script>
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/input.html b/test/parser/samples/error-script-unclosed/input.html
index a3e9f0d0b9..133b653ef9 100644
--- a/test/parser/samples/error-script-unclosed/input.html
+++ b/test/parser/samples/error-script-unclosed/input.html
@@ -1,3 +1,3 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <script>
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/error-v2.json b/test/parser/samples/error-self-reference/error-v2.json
deleted file mode 100644
index 581f5e67a1..0000000000
--- a/test/parser/samples/error-self-reference/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-self-placement",
-	"message": "<svelte:self> components can only exist inside if-blocks or each-blocks",
-	"loc": {
-		"line": 1,
-		"column": 1
-	},
-	"pos": 1
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/error.json b/test/parser/samples/error-self-reference/error.json
index 7b42f5726c..581f5e67a1 100644
--- a/test/parser/samples/error-self-reference/error.json
+++ b/test/parser/samples/error-self-reference/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-self-placement",
-	"message": "<:Self> components can only exist inside if-blocks or each-blocks",
+	"message": "<svelte:self> components can only exist inside if-blocks or each-blocks",
 	"loc": {
 		"line": 1,
 		"column": 1
diff --git a/test/parser/samples/error-self-reference/input-v2.html b/test/parser/samples/error-self-reference/input-v2.html
deleted file mode 100644
index 51a4660590..0000000000
--- a/test/parser/samples/error-self-reference/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<svelte:self/>
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/input.html b/test/parser/samples/error-self-reference/input.html
index 21b76e81bf..51a4660590 100644
--- a/test/parser/samples/error-self-reference/input.html
+++ b/test/parser/samples/error-self-reference/input.html
@@ -1 +1 @@
-<:Self/>
\ No newline at end of file
+<svelte:self/>
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
deleted file mode 100644
index 3fd2d400f6..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "unexpected-eof",
-	"message": "Unexpected end of input",
-	"loc": {
-		"line": 1,
-		"column": 2
-	},
-	"pos": 2
-}
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/input-v2.html b/test/parser/samples/error-unexpected-end-of-input-b/input-v2.html
deleted file mode 100644
index 044e45f78b..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input-b/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<d
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/input.html b/test/parser/samples/error-unexpected-end-of-input-b/input.html
index 65504cdfb9..044e45f78b 100644
--- a/test/parser/samples/error-unexpected-end-of-input-b/input.html
+++ b/test/parser/samples/error-unexpected-end-of-input-b/input.html
@@ -1 +1 @@
-<d
+<d
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
deleted file mode 100644
index 2b3402a4e3..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "unexpected-eof",
-	"message": "Unexpected end of input",
-	"loc": {
-		"line": 1,
-		"column": 1
-	},
-	"pos": 1
-}
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/input-v2.html b/test/parser/samples/error-unexpected-end-of-input-c/input-v2.html
deleted file mode 100644
index c5fa78456d..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input-c/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/input.html b/test/parser/samples/error-unexpected-end-of-input-c/input.html
index 9318418344..c5fa78456d 100644
--- a/test/parser/samples/error-unexpected-end-of-input-c/input.html
+++ b/test/parser/samples/error-unexpected-end-of-input-c/input.html
@@ -1 +1 @@
-<
+<
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
deleted file mode 100644
index 267f245aed..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "unclosed-block",
-	"message": "Block was left open",
-	"loc": {
-		"line": 1,
-		"column": 0
-	},
-	"pos": 0
-}
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/input-v2.html b/test/parser/samples/error-unexpected-end-of-input-d/input-v2.html
deleted file mode 100644
index 560d2a1984..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input-d/input-v2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{#if foo}
-	<p>foo</p>
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/input.html b/test/parser/samples/error-unexpected-end-of-input-d/input.html
index 3f73b86911..560d2a1984 100644
--- a/test/parser/samples/error-unexpected-end-of-input-d/input.html
+++ b/test/parser/samples/error-unexpected-end-of-input-d/input.html
@@ -1,2 +1,2 @@
-{{#if foo}}
+{#if foo}
 	<p>foo</p>
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input/error-v2.json b/test/parser/samples/error-unexpected-end-of-input/error-v2.json
deleted file mode 100644
index 9239341473..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "unclosed-element",
-	"message": "<div> was left open",
-	"loc": {
-		"line": 1,
-		"column": 0
-	},
-	"pos": 0
-}
diff --git a/test/parser/samples/error-unexpected-end-of-input/input-v2.html b/test/parser/samples/error-unexpected-end-of-input/input-v2.html
deleted file mode 100644
index 5790c0cccc..0000000000
--- a/test/parser/samples/error-unexpected-end-of-input/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input/input.html b/test/parser/samples/error-unexpected-end-of-input/input.html
index e54a273243..5790c0cccc 100644
--- a/test/parser/samples/error-unexpected-end-of-input/input.html
+++ b/test/parser/samples/error-unexpected-end-of-input/input.html
@@ -1 +1 @@
-<div>
+<div>
\ No newline at end of file
diff --git a/test/parser/samples/error-unmatched-closing-tag/error-v2.json b/test/parser/samples/error-unmatched-closing-tag/error-v2.json
deleted file mode 100644
index 320eb966c9..0000000000
--- a/test/parser/samples/error-unmatched-closing-tag/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-closing-tag",
-	"message": "</div> attempted to close an element that was not open",
-	"loc": {
-		"line": 1,
-		"column": 0
-	},
-	"pos": 0
-}
diff --git a/test/parser/samples/error-unmatched-closing-tag/input-v2.html b/test/parser/samples/error-unmatched-closing-tag/input-v2.html
deleted file mode 100644
index 7f5eaa32ef..0000000000
--- a/test/parser/samples/error-unmatched-closing-tag/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-</div>
\ No newline at end of file
diff --git a/test/parser/samples/error-void-closing/error-v2.json b/test/parser/samples/error-void-closing/error-v2.json
deleted file mode 100644
index fac1d04a13..0000000000
--- a/test/parser/samples/error-void-closing/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-void-content",
-	"message": "<input> is a void element and cannot have children, or a closing tag",
-	"loc": {
-		"line": 1,
-		"column": 23
-	},
-	"pos": 23
-}
diff --git a/test/parser/samples/error-void-closing/input-v2.html b/test/parser/samples/error-void-closing/input-v2.html
deleted file mode 100644
index 4f4d77ad67..0000000000
--- a/test/parser/samples/error-void-closing/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<input>this is illegal!</input>
\ No newline at end of file
diff --git a/test/parser/samples/error-void-closing/input.html b/test/parser/samples/error-void-closing/input.html
index 886b019891..4f4d77ad67 100644
--- a/test/parser/samples/error-void-closing/input.html
+++ b/test/parser/samples/error-void-closing/input.html
@@ -1 +1 @@
-<input>this is illegal!</input>
+<input>this is illegal!</input>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-children/error-v2.json b/test/parser/samples/error-window-children/error-v2.json
deleted file mode 100644
index 88c8968fd8..0000000000
--- a/test/parser/samples/error-window-children/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-window-content",
-	"message": "<svelte:window> cannot have children",
-	"loc": {
-		"line": 1,
-		"column": 15
-	},
-	"pos": 15
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-children/error.json b/test/parser/samples/error-window-children/error.json
index 85261c35b2..88c8968fd8 100644
--- a/test/parser/samples/error-window-children/error.json
+++ b/test/parser/samples/error-window-children/error.json
@@ -1,9 +1,9 @@
 {
 	"code": "invalid-window-content",
-	"message": "<:Window> cannot have children",
+	"message": "<svelte:window> cannot have children",
 	"loc": {
 		"line": 1,
-		"column": 9
+		"column": 15
 	},
-	"pos": 9
+	"pos": 15
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-window-children/input-v2.html b/test/parser/samples/error-window-children/input-v2.html
deleted file mode 100644
index caba78c9cf..0000000000
--- a/test/parser/samples/error-window-children/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<svelte:window>contents</svelte:window>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-children/input.html b/test/parser/samples/error-window-children/input.html
index eff4bebe50..caba78c9cf 100644
--- a/test/parser/samples/error-window-children/input.html
+++ b/test/parser/samples/error-window-children/input.html
@@ -1 +1 @@
-<:Window>contents</:Window>
\ No newline at end of file
+<svelte:window>contents</svelte:window>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/error-v2.json b/test/parser/samples/error-window-duplicate/error-v2.json
deleted file mode 100644
index da820574e1..0000000000
--- a/test/parser/samples/error-window-duplicate/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "duplicate-window",
-	"message": "A component can only have one <svelte:window> tag",
-	"loc": {
-		"line": 2,
-		"column": 0
-	},
-	"pos": 17
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/error.json b/test/parser/samples/error-window-duplicate/error.json
index 0fa9309f46..da820574e1 100644
--- a/test/parser/samples/error-window-duplicate/error.json
+++ b/test/parser/samples/error-window-duplicate/error.json
@@ -1,9 +1,9 @@
 {
 	"code": "duplicate-window",
-	"message": "A component can only have one <:Window> tag",
+	"message": "A component can only have one <svelte:window> tag",
 	"loc": {
 		"line": 2,
 		"column": 0
 	},
-	"pos": 11
+	"pos": 17
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/input-v2.html b/test/parser/samples/error-window-duplicate/input-v2.html
deleted file mode 100644
index 7f6a028524..0000000000
--- a/test/parser/samples/error-window-duplicate/input-v2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<svelte:window/>
-<svelte:window/>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/input.html b/test/parser/samples/error-window-duplicate/input.html
index 683468e436..7f6a028524 100644
--- a/test/parser/samples/error-window-duplicate/input.html
+++ b/test/parser/samples/error-window-duplicate/input.html
@@ -1,2 +1,2 @@
-<:Window/>
-<:Window/>
\ No newline at end of file
+<svelte:window/>
+<svelte:window/>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/error-v2.json b/test/parser/samples/error-window-inside-block/error-v2.json
deleted file mode 100644
index 77ecd08eb3..0000000000
--- a/test/parser/samples/error-window-inside-block/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-window-placement",
-	"message": "<svelte:window> tags cannot be inside elements or blocks",
-	"loc": {
-		"line": 2,
-		"column": 1
-	},
-	"pos": 11
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/error.json b/test/parser/samples/error-window-inside-block/error.json
index 87e0d409ba..77ecd08eb3 100644
--- a/test/parser/samples/error-window-inside-block/error.json
+++ b/test/parser/samples/error-window-inside-block/error.json
@@ -1,9 +1,9 @@
 {
 	"code": "invalid-window-placement",
-	"message": "<:Window> tags cannot be inside elements or blocks",
+	"message": "<svelte:window> tags cannot be inside elements or blocks",
 	"loc": {
 		"line": 2,
 		"column": 1
 	},
-	"pos": 13
+	"pos": 11
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/input-v2.html b/test/parser/samples/error-window-inside-block/input-v2.html
deleted file mode 100644
index e106e061e3..0000000000
--- a/test/parser/samples/error-window-inside-block/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#if foo}
-	<svelte:window/>
-{/if}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/input.html b/test/parser/samples/error-window-inside-block/input.html
index b361517056..e106e061e3 100644
--- a/test/parser/samples/error-window-inside-block/input.html
+++ b/test/parser/samples/error-window-inside-block/input.html
@@ -1,3 +1,3 @@
-{{#if foo}}
-	<:Window/>
-{{/if}}
\ No newline at end of file
+{#if foo}
+	<svelte:window/>
+{/if}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/error-v2.json b/test/parser/samples/error-window-inside-element/error-v2.json
deleted file mode 100644
index 60ca3b9883..0000000000
--- a/test/parser/samples/error-window-inside-element/error-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"code": "invalid-window-placement",
-	"message": "<svelte:window> tags cannot be inside elements or blocks",
-	"loc": {
-		"line": 2,
-		"column": 1
-	},
-	"pos": 7
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/error.json b/test/parser/samples/error-window-inside-element/error.json
index 4f37e8cd7f..60ca3b9883 100644
--- a/test/parser/samples/error-window-inside-element/error.json
+++ b/test/parser/samples/error-window-inside-element/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-window-placement",
-	"message": "<:Window> tags cannot be inside elements or blocks",
+	"message": "<svelte:window> tags cannot be inside elements or blocks",
 	"loc": {
 		"line": 2,
 		"column": 1
diff --git a/test/parser/samples/error-window-inside-element/input-v2.html b/test/parser/samples/error-window-inside-element/input-v2.html
deleted file mode 100644
index a10a0f479a..0000000000
--- a/test/parser/samples/error-window-inside-element/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-	<svelte:window/>
-</div>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/input.html b/test/parser/samples/error-window-inside-element/input.html
index 083de6a7d3..a10a0f479a 100644
--- a/test/parser/samples/error-window-inside-element/input.html
+++ b/test/parser/samples/error-window-inside-element/input.html
@@ -1,3 +1,3 @@
 <div>
-	<:Window/>
+	<svelte:window/>
 </div>
\ No newline at end of file
diff --git a/test/parser/samples/event-handler/input-v2.html b/test/parser/samples/event-handler/input-v2.html
deleted file mode 100644
index 731fe32e75..0000000000
--- a/test/parser/samples/event-handler/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<button on:click='set({ visible: !visible })'>toggle</button>
-
-{#if visible}
-	<p>hello!</p>
-{/if}
diff --git a/test/parser/samples/event-handler/input.html b/test/parser/samples/event-handler/input.html
index ba9bbc27fe..731fe32e75 100644
--- a/test/parser/samples/event-handler/input.html
+++ b/test/parser/samples/event-handler/input.html
@@ -1,5 +1,5 @@
 <button on:click='set({ visible: !visible })'>toggle</button>
 
-{{#if visible}}
+{#if visible}
 	<p>hello!</p>
-{{/if}}
+{/if}
diff --git a/test/parser/samples/event-handler/output-v2.json b/test/parser/samples/event-handler/output-v2.json
deleted file mode 100644
index 0d98c325c3..0000000000
--- a/test/parser/samples/event-handler/output-v2.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-	"hash": "qi54it",
-	"html": {
-		"start": 0,
-		"end": 97,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 61,
-				"type": "Element",
-				"name": "button",
-				"attributes": [
-					{
-						"start": 8,
-						"end": 45,
-						"type": "EventHandler",
-						"name": "click",
-						"expression": {
-							"type": "CallExpression",
-							"start": 18,
-							"end": 44,
-							"callee": {
-								"type": "Identifier",
-								"start": 18,
-								"end": 21,
-								"name": "set"
-							},
-							"arguments": [
-								{
-									"type": "ObjectExpression",
-									"start": 22,
-									"end": 43,
-									"properties": [
-										{
-											"type": "Property",
-											"start": 24,
-											"end": 41,
-											"method": false,
-											"shorthand": false,
-											"computed": false,
-											"key": {
-												"type": "Identifier",
-												"start": 24,
-												"end": 31,
-												"name": "visible"
-											},
-											"value": {
-												"type": "UnaryExpression",
-												"start": 33,
-												"end": 41,
-												"operator": "!",
-												"prefix": true,
-												"argument": {
-													"type": "Identifier",
-													"start": 34,
-													"end": 41,
-													"name": "visible"
-												}
-											},
-											"kind": "init"
-										}
-									]
-								}
-							]
-						}
-					}
-				],
-				"children": [
-					{
-						"start": 46,
-						"end": 52,
-						"type": "Text",
-						"data": "toggle"
-					}
-				]
-			},
-			{
-				"start": 61,
-				"end": 63,
-				"type": "Text",
-				"data": "\n\n"
-			},
-			{
-				"start": 63,
-				"end": 97,
-				"type": "IfBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 68,
-					"end": 75,
-					"name": "visible"
-				},
-				"children": [
-					{
-						"start": 78,
-						"end": 91,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 81,
-								"end": 87,
-								"type": "Text",
-								"data": "hello!"
-							}
-						]
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/event-handler/output.json b/test/parser/samples/event-handler/output.json
index 2b5844bb1b..0d98c325c3 100644
--- a/test/parser/samples/event-handler/output.json
+++ b/test/parser/samples/event-handler/output.json
@@ -1,8 +1,8 @@
 {
-	"hash": 4260626221,
+	"hash": "qi54it",
 	"html": {
 		"start": 0,
-		"end": 101,
+		"end": 97,
 		"type": "Fragment",
 		"children": [
 			{
@@ -83,25 +83,25 @@
 			},
 			{
 				"start": 63,
-				"end": 101,
+				"end": 97,
 				"type": "IfBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 69,
-					"end": 76,
+					"start": 68,
+					"end": 75,
 					"name": "visible"
 				},
 				"children": [
 					{
-						"start": 80,
-						"end": 93,
+						"start": 78,
+						"end": 91,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 83,
-								"end": 89,
+								"start": 81,
+								"end": 87,
 								"type": "Text",
 								"data": "hello!"
 							}
diff --git a/test/parser/samples/if-block-else/input-v2.html b/test/parser/samples/if-block-else/input-v2.html
deleted file mode 100644
index 28b41c046c..0000000000
--- a/test/parser/samples/if-block-else/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{#if foo}
-	<p>foo</p>
-{:else}
-	<p>not foo</p>
-{/if}
diff --git a/test/parser/samples/if-block-else/input.html b/test/parser/samples/if-block-else/input.html
index cbabce939f..28b41c046c 100644
--- a/test/parser/samples/if-block-else/input.html
+++ b/test/parser/samples/if-block-else/input.html
@@ -1,5 +1,5 @@
-{{#if foo}}
+{#if foo}
 	<p>foo</p>
-{{else}}
+{:else}
 	<p>not foo</p>
-{{/if}}
+{/if}
diff --git a/test/parser/samples/if-block-else/output-v2.json b/test/parser/samples/if-block-else/output-v2.json
deleted file mode 100644
index b922778f7e..0000000000
--- a/test/parser/samples/if-block-else/output-v2.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"hash": "dbh411",
-	"html": {
-		"start": 0,
-		"end": 51,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 51,
-				"type": "IfBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 5,
-					"end": 8,
-					"name": "foo"
-				},
-				"children": [
-					{
-						"start": 11,
-						"end": 21,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 14,
-								"end": 17,
-								"type": "Text",
-								"data": "foo"
-							}
-						]
-					}
-				],
-				"else": {
-					"start": 29,
-					"end": 46,
-					"type": "ElseBlock",
-					"children": [
-						{
-							"start": 31,
-							"end": 45,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 34,
-									"end": 41,
-									"type": "Text",
-									"data": "not foo"
-								}
-							]
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-else/output.json b/test/parser/samples/if-block-else/output.json
index af2c611220..b922778f7e 100644
--- a/test/parser/samples/if-block-else/output.json
+++ b/test/parser/samples/if-block-else/output.json
@@ -1,31 +1,31 @@
 {
-	"hash": 3134964533,
+	"hash": "dbh411",
 	"html": {
 		"start": 0,
-		"end": 56,
+		"end": 51,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 56,
+				"end": 51,
 				"type": "IfBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 6,
-					"end": 9,
+					"start": 5,
+					"end": 8,
 					"name": "foo"
 				},
 				"children": [
 					{
-						"start": 13,
-						"end": 23,
+						"start": 11,
+						"end": 21,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 16,
-								"end": 19,
+								"start": 14,
+								"end": 17,
 								"type": "Text",
 								"data": "foo"
 							}
@@ -33,20 +33,20 @@
 					}
 				],
 				"else": {
-					"start": 32,
-					"end": 49,
+					"start": 29,
+					"end": 46,
 					"type": "ElseBlock",
 					"children": [
 						{
-							"start": 34,
-							"end": 48,
+							"start": 31,
+							"end": 45,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 37,
-									"end": 44,
+									"start": 34,
+									"end": 41,
 									"type": "Text",
 									"data": "not foo"
 								}
diff --git a/test/parser/samples/if-block-elseif/input-v2.html b/test/parser/samples/if-block-elseif/input-v2.html
deleted file mode 100644
index a3bd474af7..0000000000
--- a/test/parser/samples/if-block-elseif/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{#if x > 10}
-	<p>x is greater than 10</p>
-{:elseif x < 5}
-	<p>x is less than 5</p>
-{/if}
diff --git a/test/parser/samples/if-block-elseif/input.html b/test/parser/samples/if-block-elseif/input.html
index e6beff2348..a3bd474af7 100644
--- a/test/parser/samples/if-block-elseif/input.html
+++ b/test/parser/samples/if-block-elseif/input.html
@@ -1,5 +1,5 @@
-{{#if x > 10}}
+{#if x > 10}
 	<p>x is greater than 10</p>
-{{elseif x < 5}}
+{:elseif x < 5}
 	<p>x is less than 5</p>
-{{/if}}
+{/if}
diff --git a/test/parser/samples/if-block-elseif/output-v2.json b/test/parser/samples/if-block-elseif/output-v2.json
deleted file mode 100644
index 758e3ee17a..0000000000
--- a/test/parser/samples/if-block-elseif/output-v2.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-	"hash": "tzpuwu",
-	"html": {
-		"start": 0,
-		"end": 88,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 88,
-				"type": "IfBlock",
-				"expression": {
-					"type": "BinaryExpression",
-					"start": 5,
-					"end": 11,
-					"left": {
-						"type": "Identifier",
-						"start": 5,
-						"end": 6,
-						"name": "x"
-					},
-					"operator": ">",
-					"right": {
-						"type": "Literal",
-						"start": 9,
-						"end": 11,
-						"value": 10,
-						"raw": "10"
-					}
-				},
-				"children": [
-					{
-						"start": 14,
-						"end": 41,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 17,
-								"end": 37,
-								"type": "Text",
-								"data": "x is greater than 10"
-							}
-						]
-					}
-				],
-				"else": {
-					"start": 57,
-					"end": 83,
-					"type": "ElseBlock",
-					"children": [
-						{
-							"start": 57,
-							"end": 88,
-							"type": "IfBlock",
-							"elseif": true,
-							"expression": {
-								"type": "BinaryExpression",
-								"start": 51,
-								"end": 56,
-								"left": {
-									"type": "Identifier",
-									"start": 51,
-									"end": 52,
-									"name": "x"
-								},
-								"operator": "<",
-								"right": {
-									"type": "Literal",
-									"start": 55,
-									"end": 56,
-									"value": 5,
-									"raw": "5"
-								}
-							},
-							"children": [
-								{
-									"start": 59,
-									"end": 82,
-									"type": "Element",
-									"name": "p",
-									"attributes": [],
-									"children": [
-										{
-											"start": 62,
-											"end": 78,
-											"type": "Text",
-											"data": "x is less than 5"
-										}
-									]
-								}
-							]
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-elseif/output.json b/test/parser/samples/if-block-elseif/output.json
index a2d61f2464..758e3ee17a 100644
--- a/test/parser/samples/if-block-elseif/output.json
+++ b/test/parser/samples/if-block-elseif/output.json
@@ -1,44 +1,44 @@
 {
-	"hash": 985817334,
+	"hash": "tzpuwu",
 	"html": {
 		"start": 0,
-		"end": 93,
+		"end": 88,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 93,
+				"end": 88,
 				"type": "IfBlock",
 				"expression": {
 					"type": "BinaryExpression",
-					"start": 6,
-					"end": 12,
+					"start": 5,
+					"end": 11,
 					"left": {
 						"type": "Identifier",
-						"start": 6,
-						"end": 7,
+						"start": 5,
+						"end": 6,
 						"name": "x"
 					},
 					"operator": ">",
 					"right": {
 						"type": "Literal",
-						"start": 10,
-						"end": 12,
+						"start": 9,
+						"end": 11,
 						"value": 10,
 						"raw": "10"
 					}
 				},
 				"children": [
 					{
-						"start": 16,
-						"end": 43,
+						"start": 14,
+						"end": 41,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 19,
-								"end": 39,
+								"start": 17,
+								"end": 37,
 								"type": "Text",
 								"data": "x is greater than 10"
 							}
@@ -46,45 +46,45 @@
 					}
 				],
 				"else": {
-					"start": 60,
-					"end": 86,
+					"start": 57,
+					"end": 83,
 					"type": "ElseBlock",
 					"children": [
 						{
-							"start": 60,
-							"end": 93,
+							"start": 57,
+							"end": 88,
 							"type": "IfBlock",
 							"elseif": true,
 							"expression": {
 								"type": "BinaryExpression",
-								"start": 53,
-								"end": 58,
+								"start": 51,
+								"end": 56,
 								"left": {
 									"type": "Identifier",
-									"start": 53,
-									"end": 54,
+									"start": 51,
+									"end": 52,
 									"name": "x"
 								},
 								"operator": "<",
 								"right": {
 									"type": "Literal",
-									"start": 57,
-									"end": 58,
+									"start": 55,
+									"end": 56,
 									"value": 5,
 									"raw": "5"
 								}
 							},
 							"children": [
 								{
-									"start": 62,
-									"end": 85,
+									"start": 59,
+									"end": 82,
 									"type": "Element",
 									"name": "p",
 									"attributes": [],
 									"children": [
 										{
-											"start": 65,
-											"end": 81,
+											"start": 62,
+											"end": 78,
 											"type": "Text",
 											"data": "x is less than 5"
 										}
diff --git a/test/parser/samples/if-block/input-v2.html b/test/parser/samples/if-block/input-v2.html
deleted file mode 100644
index 5851347a88..0000000000
--- a/test/parser/samples/if-block/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-{#if foo}bar{/if}
diff --git a/test/parser/samples/if-block/input.html b/test/parser/samples/if-block/input.html
index b57f7664dd..5851347a88 100644
--- a/test/parser/samples/if-block/input.html
+++ b/test/parser/samples/if-block/input.html
@@ -1 +1 @@
-{{#if foo}}bar{{/if}}
+{#if foo}bar{/if}
diff --git a/test/parser/samples/if-block/output-v2.json b/test/parser/samples/if-block/output-v2.json
deleted file mode 100644
index 25ac00f73d..0000000000
--- a/test/parser/samples/if-block/output-v2.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"hash": "w7ju0y",
-	"html": {
-		"start": 0,
-		"end": 17,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 17,
-				"type": "IfBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 5,
-					"end": 8,
-					"name": "foo"
-				},
-				"children": [
-					{
-						"start": 9,
-						"end": 12,
-						"type": "Text",
-						"data": "bar"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/if-block/output.json b/test/parser/samples/if-block/output.json
index d523d41596..25ac00f73d 100644
--- a/test/parser/samples/if-block/output.json
+++ b/test/parser/samples/if-block/output.json
@@ -1,24 +1,24 @@
 {
-	"hash": 2374871934,
+	"hash": "w7ju0y",
 	"html": {
 		"start": 0,
-		"end": 21,
+		"end": 17,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 21,
+				"end": 17,
 				"type": "IfBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 6,
-					"end": 9,
+					"start": 5,
+					"end": 8,
 					"name": "foo"
 				},
 				"children": [
 					{
-						"start": 11,
-						"end": 14,
+						"start": 9,
+						"end": 12,
 						"type": "Text",
 						"data": "bar"
 					}
diff --git a/test/parser/samples/implicitly-closed-li/input-v2.html b/test/parser/samples/implicitly-closed-li/input-v2.html
deleted file mode 100644
index 14fc1168ba..0000000000
--- a/test/parser/samples/implicitly-closed-li/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul>
-	<li>a
-	<li>b
-	<li>c
-</ul>
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/output-v2.json b/test/parser/samples/implicitly-closed-li/output-v2.json
deleted file mode 100644
index f2aca52f68..0000000000
--- a/test/parser/samples/implicitly-closed-li/output-v2.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"hash": 126082492,
-	"html": {
-		"start": 0,
-		"end": 31,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 31,
-				"type": "Element",
-				"name": "ul",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 6,
-						"type": "Text",
-						"data": "\n\t"
-					},
-					{
-						"start": 6,
-						"end": 13,
-						"type": "Element",
-						"name": "li",
-						"attributes": [],
-						"children": [
-							{
-								"start": 10,
-								"end": 13,
-								"type": "Text",
-								"data": "a\n\t"
-							}
-						]
-					},
-					{
-						"start": 13,
-						"end": 20,
-						"type": "Element",
-						"name": "li",
-						"attributes": [],
-						"children": [
-							{
-								"start": 17,
-								"end": 20,
-								"type": "Text",
-								"data": "b\n\t"
-							}
-						]
-					},
-					{
-						"start": 20,
-						"end": 26,
-						"type": "Element",
-						"name": "li",
-						"attributes": [],
-						"children": [
-							{
-								"start": 24,
-								"end": 26,
-								"type": "Text",
-								"data": "c\n"
-							}
-						]
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/input-v2.html b/test/parser/samples/nbsp/input-v2.html
deleted file mode 100644
index 11cd588757..0000000000
--- a/test/parser/samples/nbsp/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<span>&nbsp;</span>
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/output-v2.json b/test/parser/samples/nbsp/output-v2.json
deleted file mode 100644
index 8b7d487f16..0000000000
--- a/test/parser/samples/nbsp/output-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": 4049070444,
-	"html": {
-		"start": 0,
-		"end": 19,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 19,
-				"type": "Element",
-				"name": "span",
-				"attributes": [],
-				"children": [
-					{
-						"start": 6,
-						"end": 12,
-						"type": "Text",
-						"data": " "
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/input-v2.html b/test/parser/samples/raw-mustaches/input-v2.html
deleted file mode 100644
index 979697835f..0000000000
--- a/test/parser/samples/raw-mustaches/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p> {@html raw1} {@html raw2} </p>
diff --git a/test/parser/samples/raw-mustaches/input.html b/test/parser/samples/raw-mustaches/input.html
index 349fc29186..979697835f 100644
--- a/test/parser/samples/raw-mustaches/input.html
+++ b/test/parser/samples/raw-mustaches/input.html
@@ -1 +1 @@
-<p> {{{raw1}}} {{{raw2}}} </p>
+<p> {@html raw1} {@html raw2} </p>
diff --git a/test/parser/samples/raw-mustaches/output-v2.json b/test/parser/samples/raw-mustaches/output-v2.json
deleted file mode 100644
index 983b401968..0000000000
--- a/test/parser/samples/raw-mustaches/output-v2.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"hash": "9m9gjd",
-	"html": {
-		"start": 0,
-		"end": 34,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 34,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 3,
-						"end": 4,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 4,
-						"end": 16,
-						"type": "RawMustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "raw1"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 17,
-						"end": 29,
-						"type": "RawMustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 24,
-							"end": 28,
-							"name": "raw2"
-						}
-					},
-					{
-						"start": 29,
-						"end": 30,
-						"type": "Text",
-						"data": " "
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/output.json b/test/parser/samples/raw-mustaches/output.json
index e4a1b91c6c..983b401968 100644
--- a/test/parser/samples/raw-mustaches/output.json
+++ b/test/parser/samples/raw-mustaches/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 183399343,
+	"hash": "9m9gjd",
 	"html": {
 		"start": 0,
-		"end": 30,
+		"end": 34,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 30,
+				"end": 34,
 				"type": "Element",
 				"name": "p",
 				"attributes": [],
@@ -20,35 +20,35 @@
 					},
 					{
 						"start": 4,
-						"end": 14,
+						"end": 16,
 						"type": "RawMustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 7,
-							"end": 11,
+							"start": 11,
+							"end": 15,
 							"name": "raw1"
 						}
 					},
 					{
-						"start": 14,
-						"end": 15,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": " "
 					},
 					{
-						"start": 15,
-						"end": 25,
+						"start": 17,
+						"end": 29,
 						"type": "RawMustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 18,
-							"end": 22,
+							"start": 24,
+							"end": 28,
 							"name": "raw2"
 						}
 					},
 					{
-						"start": 25,
-						"end": 26,
+						"start": 29,
+						"end": 30,
 						"type": "Text",
 						"data": " "
 					}
diff --git a/test/parser/samples/refs/input-v2.html b/test/parser/samples/refs/input-v2.html
deleted file mode 100644
index fccbae2690..0000000000
--- a/test/parser/samples/refs/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<canvas ref:foo></canvas>
\ No newline at end of file
diff --git a/test/parser/samples/refs/input.html b/test/parser/samples/refs/input.html
index e5594a4af0..fccbae2690 100644
--- a/test/parser/samples/refs/input.html
+++ b/test/parser/samples/refs/input.html
@@ -1 +1 @@
-<canvas ref:foo></canvas>
+<canvas ref:foo></canvas>
\ No newline at end of file
diff --git a/test/parser/samples/refs/output-v2.json b/test/parser/samples/refs/output-v2.json
deleted file mode 100644
index 37761abaff..0000000000
--- a/test/parser/samples/refs/output-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": 850398275,
-	"html": {
-		"start": 0,
-		"end": 25,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 25,
-				"type": "Element",
-				"name": "canvas",
-				"attributes": [
-					{
-						"start": 8,
-						"end": 15,
-						"type": "Ref",
-						"name": "foo"
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/input-v2.html b/test/parser/samples/script-comment-only/input-v2.html
deleted file mode 100644
index 334e686c30..0000000000
--- a/test/parser/samples/script-comment-only/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div></div>
-
-<script>
-	// TODO write some code
-</script>
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/input.html b/test/parser/samples/script-comment-only/input.html
index 9dd86391f3..334e686c30 100644
--- a/test/parser/samples/script-comment-only/input.html
+++ b/test/parser/samples/script-comment-only/input.html
@@ -2,4 +2,4 @@
 
 <script>
 	// TODO write some code
-</script>
+</script>
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/output-v2.json b/test/parser/samples/script-comment-only/output-v2.json
deleted file mode 100644
index 1dcc6fe1f4..0000000000
--- a/test/parser/samples/script-comment-only/output-v2.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"hash": 3451341610,
-	"html": {
-		"start": 0,
-		"end": 11,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 11,
-				"type": "Element",
-				"name": "div",
-				"attributes": [],
-				"children": []
-			},
-			{
-				"start": 11,
-				"end": 13,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing-multiline/input-v2.html b/test/parser/samples/script-comment-trailing-multiline/input-v2.html
deleted file mode 100644
index dff2dc428f..0000000000
--- a/test/parser/samples/script-comment-trailing-multiline/input-v2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>Hello {name}!</h1>
-
-<script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
-
-	/*
-		trailing multiline comment
-	*/
-</script>
diff --git a/test/parser/samples/script-comment-trailing-multiline/input.html b/test/parser/samples/script-comment-trailing-multiline/input.html
index 901749ce25..dff2dc428f 100644
--- a/test/parser/samples/script-comment-trailing-multiline/input.html
+++ b/test/parser/samples/script-comment-trailing-multiline/input.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <script>
 	export default {
diff --git a/test/parser/samples/script-comment-trailing-multiline/output-v2.json b/test/parser/samples/script-comment-trailing-multiline/output-v2.json
deleted file mode 100644
index 4517795aa7..0000000000
--- a/test/parser/samples/script-comment-trailing-multiline/output-v2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"hash": "lvjec0",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 141,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 132,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
-								},
-								"kind": "init"
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing-multiline/output.json b/test/parser/samples/script-comment-trailing-multiline/output.json
index 4319919ee5..4517795aa7 100644
--- a/test/parser/samples/script-comment-trailing-multiline/output.json
+++ b/test/parser/samples/script-comment-trailing-multiline/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 1378757574,
+	"hash": "lvjec0",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,26 +20,26 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
 				]
 			},
 			{
-				"start": 24,
-				"end": 26,
+				"start": 22,
+				"end": 24,
 				"type": "Text",
 				"data": "\n\n"
 			}
@@ -47,40 +47,40 @@
 	},
 	"css": null,
 	"js": {
-		"start": 26,
-		"end": 143,
+		"start": 24,
+		"end": 141,
 		"attributes": [],
 		"content": {
 			"type": "Program",
-			"start": 34,
-			"end": 134,
+			"start": 32,
+			"end": 132,
 			"body": [
 				{
 					"type": "ExportDefaultDeclaration",
-					"start": 36,
-					"end": 95,
+					"start": 34,
+					"end": 93,
 					"declaration": {
 						"type": "ObjectExpression",
-						"start": 51,
-						"end": 94,
+						"start": 49,
+						"end": 92,
 						"properties": [
 							{
 								"type": "Property",
-								"start": 55,
-								"end": 91,
+								"start": 53,
+								"end": 89,
 								"method": false,
 								"shorthand": false,
 								"computed": false,
 								"key": {
 									"type": "Identifier",
-									"start": 55,
-									"end": 59,
+									"start": 53,
+									"end": 57,
 									"name": "data"
 								},
 								"value": {
 									"type": "ArrowFunctionExpression",
-									"start": 61,
-									"end": 91,
+									"start": 59,
+									"end": 89,
 									"id": null,
 									"generator": false,
 									"expression": true,
@@ -88,26 +88,26 @@
 									"params": [],
 									"body": {
 										"type": "ObjectExpression",
-										"start": 68,
-										"end": 90,
+										"start": 66,
+										"end": 88,
 										"properties": [
 											{
 												"type": "Property",
-												"start": 73,
-												"end": 86,
+												"start": 71,
+												"end": 84,
 												"method": false,
 												"shorthand": false,
 												"computed": false,
 												"key": {
 													"type": "Identifier",
-													"start": 73,
-													"end": 77,
+													"start": 71,
+													"end": 75,
 													"name": "name"
 												},
 												"value": {
 													"type": "Literal",
-													"start": 79,
-													"end": 86,
+													"start": 77,
+													"end": 84,
 													"value": "world",
 													"raw": "'world'"
 												},
diff --git a/test/parser/samples/script-comment-trailing/input-v2.html b/test/parser/samples/script-comment-trailing/input-v2.html
deleted file mode 100644
index d126aad2fb..0000000000
--- a/test/parser/samples/script-comment-trailing/input-v2.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1>Hello {name}!</h1>
-
-<script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
-
-	// trailing line comment
-</script>
diff --git a/test/parser/samples/script-comment-trailing/input.html b/test/parser/samples/script-comment-trailing/input.html
index 76c5391099..d126aad2fb 100644
--- a/test/parser/samples/script-comment-trailing/input.html
+++ b/test/parser/samples/script-comment-trailing/input.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <script>
 	export default {
diff --git a/test/parser/samples/script-comment-trailing/output-v2.json b/test/parser/samples/script-comment-trailing/output-v2.json
deleted file mode 100644
index 0ec47a4559..0000000000
--- a/test/parser/samples/script-comment-trailing/output-v2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"hash": "19sno7e",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 130,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 121,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
-								},
-								"kind": "init"
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing/output.json b/test/parser/samples/script-comment-trailing/output.json
index 2977d6a7fa..0ec47a4559 100644
--- a/test/parser/samples/script-comment-trailing/output.json
+++ b/test/parser/samples/script-comment-trailing/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 619854804,
+	"hash": "19sno7e",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,26 +20,26 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
 				]
 			},
 			{
-				"start": 24,
-				"end": 26,
+				"start": 22,
+				"end": 24,
 				"type": "Text",
 				"data": "\n\n"
 			}
@@ -47,40 +47,40 @@
 	},
 	"css": null,
 	"js": {
-		"start": 26,
-		"end": 132,
+		"start": 24,
+		"end": 130,
 		"attributes": [],
 		"content": {
 			"type": "Program",
-			"start": 34,
-			"end": 123,
+			"start": 32,
+			"end": 121,
 			"body": [
 				{
 					"type": "ExportDefaultDeclaration",
-					"start": 36,
-					"end": 95,
+					"start": 34,
+					"end": 93,
 					"declaration": {
 						"type": "ObjectExpression",
-						"start": 51,
-						"end": 94,
+						"start": 49,
+						"end": 92,
 						"properties": [
 							{
 								"type": "Property",
-								"start": 55,
-								"end": 91,
+								"start": 53,
+								"end": 89,
 								"method": false,
 								"shorthand": false,
 								"computed": false,
 								"key": {
 									"type": "Identifier",
-									"start": 55,
-									"end": 59,
+									"start": 53,
+									"end": 57,
 									"name": "data"
 								},
 								"value": {
 									"type": "ArrowFunctionExpression",
-									"start": 61,
-									"end": 91,
+									"start": 59,
+									"end": 89,
 									"id": null,
 									"generator": false,
 									"expression": true,
@@ -88,26 +88,26 @@
 									"params": [],
 									"body": {
 										"type": "ObjectExpression",
-										"start": 68,
-										"end": 90,
+										"start": 66,
+										"end": 88,
 										"properties": [
 											{
 												"type": "Property",
-												"start": 73,
-												"end": 86,
+												"start": 71,
+												"end": 84,
 												"method": false,
 												"shorthand": false,
 												"computed": false,
 												"key": {
 													"type": "Identifier",
-													"start": 73,
-													"end": 77,
+													"start": 71,
+													"end": 75,
 													"name": "name"
 												},
 												"value": {
 													"type": "Literal",
-													"start": 79,
-													"end": 86,
+													"start": 77,
+													"end": 84,
 													"value": "world",
 													"raw": "'world'"
 												},
diff --git a/test/parser/samples/script/input-v2.html b/test/parser/samples/script/input-v2.html
deleted file mode 100644
index afd9e23a73..0000000000
--- a/test/parser/samples/script/input-v2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>Hello {name}!</h1>
-
-<script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
-</script>
diff --git a/test/parser/samples/script/input.html b/test/parser/samples/script/input.html
index e46cedc667..afd9e23a73 100644
--- a/test/parser/samples/script/input.html
+++ b/test/parser/samples/script/input.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <script>
 	export default {
diff --git a/test/parser/samples/script/output-v2.json b/test/parser/samples/script/output-v2.json
deleted file mode 100644
index 1a68ead9b6..0000000000
--- a/test/parser/samples/script/output-v2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"hash": "6jy7zq",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 103,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 94,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
-								},
-								"kind": "init"
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/script/output.json b/test/parser/samples/script/output.json
index 5c8acef657..1a68ead9b6 100644
--- a/test/parser/samples/script/output.json
+++ b/test/parser/samples/script/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 388108696,
+	"hash": "6jy7zq",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,26 +20,26 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
 				]
 			},
 			{
-				"start": 24,
-				"end": 26,
+				"start": 22,
+				"end": 24,
 				"type": "Text",
 				"data": "\n\n"
 			}
@@ -47,40 +47,40 @@
 	},
 	"css": null,
 	"js": {
-		"start": 26,
-		"end": 105,
+		"start": 24,
+		"end": 103,
 		"attributes": [],
 		"content": {
 			"type": "Program",
-			"start": 34,
-			"end": 96,
+			"start": 32,
+			"end": 94,
 			"body": [
 				{
 					"type": "ExportDefaultDeclaration",
-					"start": 36,
-					"end": 95,
+					"start": 34,
+					"end": 93,
 					"declaration": {
 						"type": "ObjectExpression",
-						"start": 51,
-						"end": 94,
+						"start": 49,
+						"end": 92,
 						"properties": [
 							{
 								"type": "Property",
-								"start": 55,
-								"end": 91,
+								"start": 53,
+								"end": 89,
 								"method": false,
 								"shorthand": false,
 								"computed": false,
 								"key": {
 									"type": "Identifier",
-									"start": 55,
-									"end": 59,
+									"start": 53,
+									"end": 57,
 									"name": "data"
 								},
 								"value": {
 									"type": "ArrowFunctionExpression",
-									"start": 61,
-									"end": 91,
+									"start": 59,
+									"end": 89,
 									"id": null,
 									"generator": false,
 									"expression": true,
@@ -88,26 +88,26 @@
 									"params": [],
 									"body": {
 										"type": "ObjectExpression",
-										"start": 68,
-										"end": 90,
+										"start": 66,
+										"end": 88,
 										"properties": [
 											{
 												"type": "Property",
-												"start": 73,
-												"end": 86,
+												"start": 71,
+												"end": 84,
 												"method": false,
 												"shorthand": false,
 												"computed": false,
 												"key": {
 													"type": "Identifier",
-													"start": 73,
-													"end": 77,
+													"start": 71,
+													"end": 75,
 													"name": "name"
 												},
 												"value": {
 													"type": "Literal",
-													"start": 79,
-													"end": 86,
+													"start": 77,
+													"end": 84,
 													"value": "world",
 													"raw": "'world'"
 												},
diff --git a/test/parser/samples/self-closing-element/input-v2.html b/test/parser/samples/self-closing-element/input-v2.html
deleted file mode 100644
index 78e7012b82..0000000000
--- a/test/parser/samples/self-closing-element/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div/>
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/input.html b/test/parser/samples/self-closing-element/input.html
index 61da16d026..78e7012b82 100644
--- a/test/parser/samples/self-closing-element/input.html
+++ b/test/parser/samples/self-closing-element/input.html
@@ -1 +1 @@
-<div/>
+<div/>
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/output-v2.json b/test/parser/samples/self-closing-element/output-v2.json
deleted file mode 100644
index 80c1ef5bde..0000000000
--- a/test/parser/samples/self-closing-element/output-v2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"hash": 4200201687,
-	"html": {
-		"start": 0,
-		"end": 6,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 6,
-				"type": "Element",
-				"name": "div",
-				"attributes": [],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/input-v2.html b/test/parser/samples/self-reference/input-v2.html
deleted file mode 100644
index 241a266b7b..0000000000
--- a/test/parser/samples/self-reference/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#if depth > 1}
-	<svelte:self depth='{depth - 1}'/>
-{/if}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/input.html b/test/parser/samples/self-reference/input.html
index cda950d2e2..241a266b7b 100644
--- a/test/parser/samples/self-reference/input.html
+++ b/test/parser/samples/self-reference/input.html
@@ -1,3 +1,3 @@
-{{#if depth > 1}}
-	<:Self depth='{{depth - 1}}'/>
-{{/if}}
\ No newline at end of file
+{#if depth > 1}
+	<svelte:self depth='{depth - 1}'/>
+{/if}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/output-v2.json b/test/parser/samples/self-reference/output-v2.json
deleted file mode 100644
index ced5eabc41..0000000000
--- a/test/parser/samples/self-reference/output-v2.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-	"hash": "1wh7lqr",
-	"html": {
-		"start": 0,
-		"end": 57,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 57,
-				"type": "IfBlock",
-				"expression": {
-					"type": "BinaryExpression",
-					"start": 5,
-					"end": 14,
-					"left": {
-						"type": "Identifier",
-						"start": 5,
-						"end": 10,
-						"name": "depth"
-					},
-					"operator": ">",
-					"right": {
-						"type": "Literal",
-						"start": 13,
-						"end": 14,
-						"value": 1,
-						"raw": "1"
-					}
-				},
-				"children": [
-					{
-						"start": 17,
-						"end": 51,
-						"type": "Element",
-						"name": "svelte:self",
-						"attributes": [
-							{
-								"start": 30,
-								"end": 49,
-								"type": "Attribute",
-								"name": "depth",
-								"value": [
-									{
-										"start": 37,
-										"end": 48,
-										"type": "MustacheTag",
-										"expression": {
-											"type": "BinaryExpression",
-											"start": 38,
-											"end": 47,
-											"left": {
-												"type": "Identifier",
-												"start": 38,
-												"end": 43,
-												"name": "depth"
-											},
-											"operator": "-",
-											"right": {
-												"type": "Literal",
-												"start": 46,
-												"end": 47,
-												"value": 1,
-												"raw": "1"
-											}
-										}
-									}
-								]
-							}
-						],
-						"children": []
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/output.json b/test/parser/samples/self-reference/output.json
index f9c788bd2f..ced5eabc41 100644
--- a/test/parser/samples/self-reference/output.json
+++ b/test/parser/samples/self-reference/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 216762188,
+	"hash": "1wh7lqr",
 	"html": {
 		"start": 0,
 		"end": 57,
@@ -11,55 +11,55 @@
 				"type": "IfBlock",
 				"expression": {
 					"type": "BinaryExpression",
-					"start": 6,
-					"end": 15,
+					"start": 5,
+					"end": 14,
 					"left": {
 						"type": "Identifier",
-						"start": 6,
-						"end": 11,
+						"start": 5,
+						"end": 10,
 						"name": "depth"
 					},
 					"operator": ">",
 					"right": {
 						"type": "Literal",
-						"start": 14,
-						"end": 15,
+						"start": 13,
+						"end": 14,
 						"value": 1,
 						"raw": "1"
 					}
 				},
 				"children": [
 					{
-						"start": 19,
-						"end": 49,
+						"start": 17,
+						"end": 51,
 						"type": "Element",
-						"name": ":Self",
+						"name": "svelte:self",
 						"attributes": [
 							{
-								"start": 26,
-								"end": 47,
+								"start": 30,
+								"end": 49,
 								"type": "Attribute",
 								"name": "depth",
 								"value": [
 									{
-										"start": 33,
-										"end": 46,
+										"start": 37,
+										"end": 48,
 										"type": "MustacheTag",
 										"expression": {
 											"type": "BinaryExpression",
-											"start": 35,
-											"end": 44,
+											"start": 38,
+											"end": 47,
 											"left": {
 												"type": "Identifier",
-												"start": 35,
-												"end": 40,
+												"start": 38,
+												"end": 43,
 												"name": "depth"
 											},
 											"operator": "-",
 											"right": {
 												"type": "Literal",
-												"start": 43,
-												"end": 44,
+												"start": 46,
+												"end": 47,
 												"value": 1,
 												"raw": "1"
 											}
diff --git a/test/parser/samples/space-between-mustaches/input-v2.html b/test/parser/samples/space-between-mustaches/input-v2.html
deleted file mode 100644
index 0dd099df11..0000000000
--- a/test/parser/samples/space-between-mustaches/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p> {a} {b} : {c} : </p>
diff --git a/test/parser/samples/space-between-mustaches/input.html b/test/parser/samples/space-between-mustaches/input.html
index 465a43e5f1..0dd099df11 100644
--- a/test/parser/samples/space-between-mustaches/input.html
+++ b/test/parser/samples/space-between-mustaches/input.html
@@ -1 +1 @@
-<p> {{a}} {{b}} : {{c}} : </p>
+<p> {a} {b} : {c} : </p>
diff --git a/test/parser/samples/space-between-mustaches/output-v2.json b/test/parser/samples/space-between-mustaches/output-v2.json
deleted file mode 100644
index b6b5c1a4df..0000000000
--- a/test/parser/samples/space-between-mustaches/output-v2.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-	"hash": "1n7rpsi",
-	"html": {
-		"start": 0,
-		"end": 24,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 24,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 3,
-						"end": 4,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 4,
-						"end": 7,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 5,
-							"end": 6,
-							"name": "a"
-						}
-					},
-					{
-						"start": 7,
-						"end": 8,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 8,
-						"end": 11,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 9,
-							"end": 10,
-							"name": "b"
-						}
-					},
-					{
-						"start": 11,
-						"end": 14,
-						"type": "Text",
-						"data": " : "
-					},
-					{
-						"start": 14,
-						"end": 17,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 15,
-							"end": 16,
-							"name": "c"
-						}
-					},
-					{
-						"start": 17,
-						"end": 20,
-						"type": "Text",
-						"data": " : "
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/space-between-mustaches/output.json b/test/parser/samples/space-between-mustaches/output.json
index 854608fb29..b6b5c1a4df 100644
--- a/test/parser/samples/space-between-mustaches/output.json
+++ b/test/parser/samples/space-between-mustaches/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 1185019088,
+	"hash": "1n7rpsi",
 	"html": {
 		"start": 0,
-		"end": 30,
+		"end": 24,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 30,
+				"end": 24,
 				"type": "Element",
 				"name": "p",
 				"attributes": [],
@@ -20,52 +20,52 @@
 					},
 					{
 						"start": 4,
-						"end": 9,
+						"end": 7,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 6,
-							"end": 7,
+							"start": 5,
+							"end": 6,
 							"name": "a"
 						}
 					},
 					{
-						"start": 9,
-						"end": 10,
+						"start": 7,
+						"end": 8,
 						"type": "Text",
 						"data": " "
 					},
 					{
-						"start": 10,
-						"end": 15,
+						"start": 8,
+						"end": 11,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 13,
+							"start": 9,
+							"end": 10,
 							"name": "b"
 						}
 					},
 					{
-						"start": 15,
-						"end": 18,
+						"start": 11,
+						"end": 14,
 						"type": "Text",
 						"data": " : "
 					},
 					{
-						"start": 18,
-						"end": 23,
+						"start": 14,
+						"end": 17,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 20,
-							"end": 21,
+							"start": 15,
+							"end": 16,
 							"name": "c"
 						}
 					},
 					{
-						"start": 23,
-						"end": 26,
+						"start": 17,
+						"end": 20,
 						"type": "Text",
 						"data": " : "
 					}
diff --git a/test/parser/samples/spread/input-v2.html b/test/parser/samples/spread/input-v2.html
deleted file mode 100644
index 836425cae3..0000000000
--- a/test/parser/samples/spread/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div {...props}></div>
diff --git a/test/parser/samples/spread/input.html b/test/parser/samples/spread/input.html
index b5a2c79600..836425cae3 100644
--- a/test/parser/samples/spread/input.html
+++ b/test/parser/samples/spread/input.html
@@ -1 +1 @@
-<div {{...props}}></div>
+<div {...props}></div>
diff --git a/test/parser/samples/spread/output-v2.json b/test/parser/samples/spread/output-v2.json
deleted file mode 100644
index e9c53e7446..0000000000
--- a/test/parser/samples/spread/output-v2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"hash": "z82kse",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 15,
-						"type": "Spread",
-						"expression": {
-							"type": "Identifier",
-							"start": 9,
-							"end": 14,
-							"name": "props"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/spread/output.json b/test/parser/samples/spread/output.json
index 365c6be625..e9c53e7446 100644
--- a/test/parser/samples/spread/output.json
+++ b/test/parser/samples/spread/output.json
@@ -1,24 +1,24 @@
 {
-	"hash": "phg0l6",
+	"hash": "z82kse",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 17,
+						"end": 15,
 						"type": "Spread",
 						"expression": {
 							"type": "Identifier",
-							"start": 10,
-							"end": 15,
+							"start": 9,
+							"end": 14,
 							"name": "props"
 						}
 					}
@@ -29,4 +29,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/input-v2.html b/test/parser/samples/textarea-children/input-v2.html
deleted file mode 100644
index 6cc3072e5c..0000000000
--- a/test/parser/samples/textarea-children/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<textarea>
-	<p>not actually an element. {foo}</p>
-</textarea>
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/input.html b/test/parser/samples/textarea-children/input.html
index de50c807d6..6cc3072e5c 100644
--- a/test/parser/samples/textarea-children/input.html
+++ b/test/parser/samples/textarea-children/input.html
@@ -1,3 +1,3 @@
 <textarea>
-	<p>not actually an element. {{foo}}</p>
+	<p>not actually an element. {foo}</p>
 </textarea>
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/output-v2.json b/test/parser/samples/textarea-children/output-v2.json
deleted file mode 100644
index 2e219bb750..0000000000
--- a/test/parser/samples/textarea-children/output-v2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"hash": "1uyqul7",
-	"html": {
-		"start": 0,
-		"end": 61,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 61,
-				"type": "Element",
-				"name": "textarea",
-				"attributes": [],
-				"children": [
-					{
-						"start": 10,
-						"end": 40,
-						"type": "Text",
-						"data": "\n\t<p>not actually an element. "
-					},
-					{
-						"start": 40,
-						"end": 45,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 41,
-							"end": 44,
-							"name": "foo"
-						}
-					},
-					{
-						"start": 45,
-						"end": 50,
-						"type": "Text",
-						"data": "</p>\n"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/output.json b/test/parser/samples/textarea-children/output.json
index d4ea6f04bb..2e219bb750 100644
--- a/test/parser/samples/textarea-children/output.json
+++ b/test/parser/samples/textarea-children/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 2992234421,
+	"hash": "1uyqul7",
 	"html": {
 		"start": 0,
-		"end": 63,
+		"end": 61,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 63,
+				"end": 61,
 				"type": "Element",
 				"name": "textarea",
 				"attributes": [],
@@ -20,18 +20,18 @@
 					},
 					{
 						"start": 40,
-						"end": 47,
+						"end": 45,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 42,
-							"end": 45,
+							"start": 41,
+							"end": 44,
 							"name": "foo"
 						}
 					},
 					{
-						"start": 47,
-						"end": 52,
+						"start": 45,
+						"end": 50,
 						"type": "Text",
 						"data": "</p>\n"
 					}
diff --git a/test/parser/samples/transition-intro-no-params/input-v2.html b/test/parser/samples/transition-intro-no-params/input-v2.html
deleted file mode 100644
index e5e4171434..0000000000
--- a/test/parser/samples/transition-intro-no-params/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div in:fade>fades in</div>
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro-no-params/output-v2.json b/test/parser/samples/transition-intro-no-params/output-v2.json
deleted file mode 100644
index cca469ca3e..0000000000
--- a/test/parser/samples/transition-intro-no-params/output-v2.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"hash": 503236647,
-	"html": {
-		"start": 0,
-		"end": 27,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 27,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 12,
-						"type": "Transition",
-						"name": "fade",
-						"intro": true,
-						"outro": false,
-						"expression": null
-					}
-				],
-				"children": [
-					{
-						"start": 13,
-						"end": 21,
-						"type": "Text",
-						"data": "fades in"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/input-v2.html b/test/parser/samples/transition-intro/input-v2.html
deleted file mode 100644
index db14cfcb2f..0000000000
--- a/test/parser/samples/transition-intro/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div in:style='{opacity: 0}'>fades in</div>
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/output-v2.json b/test/parser/samples/transition-intro/output-v2.json
deleted file mode 100644
index 54ec4da93d..0000000000
--- a/test/parser/samples/transition-intro/output-v2.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"hash": 3731674194,
-	"html": {
-		"start": 0,
-		"end": 43,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 43,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 28,
-						"type": "Transition",
-						"name": "style",
-						"intro": true,
-						"outro": false,
-						"expression": {
-							"type": "ObjectExpression",
-							"start": 15,
-							"end": 27,
-							"properties": [
-								{
-									"type": "Property",
-									"start": 16,
-									"end": 26,
-									"method": false,
-									"shorthand": false,
-									"computed": false,
-									"key": {
-										"type": "Identifier",
-										"start": 16,
-										"end": 23,
-										"name": "opacity"
-									},
-									"value": {
-										"type": "Literal",
-										"start": 25,
-										"end": 26,
-										"value": 0,
-										"raw": "0"
-									},
-									"kind": "init"
-								}
-							]
-						}
-					}
-				],
-				"children": [
-					{
-						"start": 29,
-						"end": 37,
-						"type": "Text",
-						"data": "fades in"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/input-v2.html b/test/parser/samples/unusual-identifier/input-v2.html
deleted file mode 100644
index 192f632ceb..0000000000
--- a/test/parser/samples/unusual-identifier/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each things as 𐊧}
-	<p>{𐊧}</p>
-{/each}
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/input.html b/test/parser/samples/unusual-identifier/input.html
index 71c3f4a12f..192f632ceb 100644
--- a/test/parser/samples/unusual-identifier/input.html
+++ b/test/parser/samples/unusual-identifier/input.html
@@ -1,3 +1,3 @@
-{{#each things as 𐊧}}
-	<p>{{𐊧}}</p>
-{{/each}}
\ No newline at end of file
+{#each things as 𐊧}
+	<p>{𐊧}</p>
+{/each}
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/output-v2.json b/test/parser/samples/unusual-identifier/output-v2.json
deleted file mode 100644
index e4a290c0a6..0000000000
--- a/test/parser/samples/unusual-identifier/output-v2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"hash": "8weqxs",
-	"html": {
-		"start": 0,
-		"end": 41,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 41,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 13,
-					"name": "things"
-				},
-				"children": [
-					{
-						"start": 22,
-						"end": 33,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 25,
-								"end": 29,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 26,
-									"end": 28,
-									"name": "𐊧"
-								}
-							}
-						]
-					}
-				],
-				"context": "𐊧"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/output.json b/test/parser/samples/unusual-identifier/output.json
index 6434526df5..e4a290c0a6 100644
--- a/test/parser/samples/unusual-identifier/output.json
+++ b/test/parser/samples/unusual-identifier/output.json
@@ -1,36 +1,36 @@
 {
-	"hash": 795130236,
+	"hash": "8weqxs",
 	"html": {
 		"start": 0,
-		"end": 47,
+		"end": 41,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 47,
+				"end": 41,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 14,
+					"start": 7,
+					"end": 13,
 					"name": "things"
 				},
 				"children": [
 					{
-						"start": 24,
-						"end": 37,
+						"start": 22,
+						"end": 33,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 27,
-								"end": 33,
+								"start": 25,
+								"end": 29,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 29,
-									"end": 31,
+									"start": 26,
+									"end": 28,
 									"name": "𐊧"
 								}
 							}
diff --git a/test/parser/samples/whitespace-leading-trailing/input-v2.html b/test/parser/samples/whitespace-leading-trailing/input-v2.html
deleted file mode 100644
index c784c14e9e..0000000000
--- a/test/parser/samples/whitespace-leading-trailing/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-				<p>just chillin' over here</p>
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/input.html b/test/parser/samples/whitespace-leading-trailing/input.html
index 569aa2db4b..c784c14e9e 100644
--- a/test/parser/samples/whitespace-leading-trailing/input.html
+++ b/test/parser/samples/whitespace-leading-trailing/input.html
@@ -1,3 +1,3 @@
 
 
-				<p>just chillin' over here</p>
+				<p>just chillin' over here</p>
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/output-v2.json b/test/parser/samples/whitespace-leading-trailing/output-v2.json
deleted file mode 100644
index c057bd1f1e..0000000000
--- a/test/parser/samples/whitespace-leading-trailing/output-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": 424837432,
-	"html": {
-		"start": 6,
-		"end": 36,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 6,
-				"type": "Text",
-				"data": "\n\n\t\t\t\t"
-			},
-			{
-				"start": 6,
-				"end": 36,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 9,
-						"end": 32,
-						"type": "Text",
-						"data": "just chillin' over here"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/input-v2.html b/test/parser/samples/whitespace-normal/input-v2.html
deleted file mode 100644
index c845c255dd..0000000000
--- a/test/parser/samples/whitespace-normal/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Hello <strong>{name}! </strong><span>How are you?</span></h1>
diff --git a/test/parser/samples/whitespace-normal/input.html b/test/parser/samples/whitespace-normal/input.html
index 372184ebf3..c845c255dd 100644
--- a/test/parser/samples/whitespace-normal/input.html
+++ b/test/parser/samples/whitespace-normal/input.html
@@ -1 +1 @@
-<h1>Hello <strong>{{name}}! </strong><span>How are you?</span></h1>
+<h1>Hello <strong>{name}! </strong><span>How are you?</span></h1>
diff --git a/test/parser/samples/whitespace-normal/output-v2.json b/test/parser/samples/whitespace-normal/output-v2.json
deleted file mode 100644
index e9d6a39b08..0000000000
--- a/test/parser/samples/whitespace-normal/output-v2.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-	"hash": "1827l8g",
-	"html": {
-		"start": 0,
-		"end": 65,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 65,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 35,
-						"type": "Element",
-						"name": "strong",
-						"attributes": [],
-						"children": [
-							{
-								"start": 18,
-								"end": 24,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 19,
-									"end": 23,
-									"name": "name"
-								}
-							},
-							{
-								"start": 24,
-								"end": 26,
-								"type": "Text",
-								"data": "! "
-							}
-						]
-					},
-					{
-						"start": 35,
-						"end": 60,
-						"type": "Element",
-						"name": "span",
-						"attributes": [],
-						"children": [
-							{
-								"start": 41,
-								"end": 53,
-								"type": "Text",
-								"data": "How are you?"
-							}
-						]
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/output.json b/test/parser/samples/whitespace-normal/output.json
index 5b609c8e36..e9d6a39b08 100644
--- a/test/parser/samples/whitespace-normal/output.json
+++ b/test/parser/samples/whitespace-normal/output.json
@@ -1,13 +1,13 @@
 {
-	"hash": 2961389466,
+	"hash": "1827l8g",
 	"html": {
 		"start": 0,
-		"end": 67,
+		"end": 65,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 67,
+				"end": 65,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,40 +20,40 @@
 					},
 					{
 						"start": 10,
-						"end": 37,
+						"end": 35,
 						"type": "Element",
 						"name": "strong",
 						"attributes": [],
 						"children": [
 							{
 								"start": 18,
-								"end": 26,
+								"end": 24,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 20,
-									"end": 24,
+									"start": 19,
+									"end": 23,
 									"name": "name"
 								}
 							},
 							{
-								"start": 26,
-								"end": 28,
+								"start": 24,
+								"end": 26,
 								"type": "Text",
 								"data": "! "
 							}
 						]
 					},
 					{
-						"start": 37,
-						"end": 62,
+						"start": 35,
+						"end": 60,
 						"type": "Element",
 						"name": "span",
 						"attributes": [],
 						"children": [
 							{
-								"start": 43,
-								"end": 55,
+								"start": 41,
+								"end": 53,
 								"type": "Text",
 								"data": "How are you?"
 							}
diff --git a/test/parser/samples/yield/input-v2.html b/test/parser/samples/yield/input-v2.html
deleted file mode 100644
index f5e8aad053..0000000000
--- a/test/parser/samples/yield/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-{yield}
\ No newline at end of file
diff --git a/test/parser/samples/yield/input.html b/test/parser/samples/yield/input.html
index fb5c4b157d..f5e8aad053 100644
--- a/test/parser/samples/yield/input.html
+++ b/test/parser/samples/yield/input.html
@@ -1 +1 @@
-{{yield}}
\ No newline at end of file
+{yield}
\ No newline at end of file
diff --git a/test/parser/samples/yield/output-v2.json b/test/parser/samples/yield/output-v2.json
deleted file mode 100644
index da5ed52d0e..0000000000
--- a/test/parser/samples/yield/output-v2.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"hash": "1na2f8c",
-	"html": {
-		"start": 0,
-		"end": 7,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 7,
-				"type": "MustacheTag",
-				"expression": {
-					"start": 1,
-					"end": 6,
-					"type": "Identifier",
-					"name": "yield"
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/yield/output.json b/test/parser/samples/yield/output.json
index d3f3e602a6..da5ed52d0e 100644
--- a/test/parser/samples/yield/output.json
+++ b/test/parser/samples/yield/output.json
@@ -1,17 +1,20 @@
 {
-	"hash": 3659433152,
+	"hash": "1na2f8c",
 	"html": {
 		"start": 0,
-		"end": 9,
+		"end": 7,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 9,
-				"type": "Element",
-				"name": "slot",
-				"attributes": [],
-				"children": []
+				"end": 7,
+				"type": "MustacheTag",
+				"expression": {
+					"start": 1,
+					"end": 6,
+					"type": "Identifier",
+					"name": "yield"
+				}
 			}
 		]
 	},