diff --git a/test/validator/samples/a11y-html-has-lang/input.svelte b/test/validator/samples/a11y-html-has-lang/input.svelte
index 0fa84d90a6..ccc238e5d4 100644
--- a/test/validator/samples/a11y-html-has-lang/input.svelte
+++ b/test/validator/samples/a11y-html-has-lang/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let language;
+</script>
+
 <html lang="en"></html>
 <html lang="en-US"></html>
 <html lang={language}></html>
diff --git a/test/validator/samples/a11y-html-has-lang/warnings.json b/test/validator/samples/a11y-html-has-lang/warnings.json
index 963a2570db..2ac8a2e5e0 100644
--- a/test/validator/samples/a11y-html-has-lang/warnings.json
+++ b/test/validator/samples/a11y-html-has-lang/warnings.json
@@ -4,14 +4,14 @@
 		"message": "A11y: <html> element should have a lang attribute",
 		"start": {
 			"column": 0,
-			"line": 5,
-			"character": 82
+			"line": 9,
+			"character": 124
 		},
 		"end": {
-			"line": 5,
+			"line": 9,
 			"column": 13,
-			"character": 95
+			"character": 137
 		},
-		"pos": 82
+		"pos": 124
 	}
 ]
diff --git a/test/validator/samples/a11y-iframe-has-title/input.svelte b/test/validator/samples/a11y-iframe-has-title/input.svelte
index 5e07ca5a08..4689a2dcf7 100644
--- a/test/validator/samples/a11y-iframe-has-title/input.svelte
+++ b/test/validator/samples/a11y-iframe-has-title/input.svelte
@@ -1 +1,5 @@
-<iframe src='{src}'></iframe>
\ No newline at end of file
+<script>
+	export let src;
+</script>
+
+<iframe src={src}></iframe>
\ No newline at end of file
diff --git a/test/validator/samples/a11y-iframe-has-title/warnings.json b/test/validator/samples/a11y-iframe-has-title/warnings.json
index d71bae1dae..cc80cceaa2 100644
--- a/test/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/test/validator/samples/a11y-iframe-has-title/warnings.json
@@ -3,15 +3,15 @@
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <iframe> element should have a title attribute",
 		"start": {
-			"line": 1,
+			"line": 5,
 			"column": 0,
-			"character": 0
+			"character": 37
 		},
 		"end": {
-			"line": 1,
-			"column": 29,
-			"character": 29
+			"line": 5,
+			"column": 27,
+			"character": 64
 		},
-		"pos": 0
+		"pos": 37
 	}
 ]
diff --git a/test/validator/samples/a11y-tabindex-no-positive/input.svelte b/test/validator/samples/a11y-tabindex-no-positive/input.svelte
index e922078221..5a90e32f8d 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/input.svelte
+++ b/test/validator/samples/a11y-tabindex-no-positive/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let foo;
+</script>
+
 <div tabindex='-1'/>
 <div tabindex='0'/>
 <div tabindex='1'/>
diff --git a/test/validator/samples/a11y-tabindex-no-positive/warnings.json b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
index 0695de4d7a..ac3c6bd994 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/warnings.json
+++ b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
@@ -3,15 +3,15 @@
 		"code": "a11y-positive-tabindex",
 		"message": "A11y: avoid tabindex values above zero",
 		"start": {
-			"line": 3,
+			"line": 7,
 			"column": 5,
-			"character": 46
+			"character": 76
 		},
 		"end": {
-			"line": 3,
+			"line": 7,
 			"column": 17,
-			"character": 58
+			"character": 88
 		},
-		"pos": 46
+		"pos": 76
 	}
 ]
diff --git a/test/validator/samples/animation-missing/input.svelte b/test/validator/samples/animation-missing/input.svelte
index d67120436b..7f97618162 100644
--- a/test/validator/samples/animation-missing/input.svelte
+++ b/test/validator/samples/animation-missing/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let things;
+</script>
+
 {#each things as thing (thing)}
 	<div animate:foo></div>
 {/each}
\ No newline at end of file
diff --git a/test/validator/samples/animation-missing/warnings.json b/test/validator/samples/animation-missing/warnings.json
index a9df077ade..78da5371a2 100644
--- a/test/validator/samples/animation-missing/warnings.json
+++ b/test/validator/samples/animation-missing/warnings.json
@@ -2,14 +2,14 @@
 	"code": "missing-declaration",
 	"message": "'foo' is not defined",
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 6,
-		"character": 38
+		"character": 71
 	},
 	"end": {
-		"line": 2,
+		"line": 6,
 		"column": 17,
-		"character": 49
+		"character": 82
 	},
-	"pos": 38
+	"pos": 71
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg-child/errors.json b/test/validator/samples/binding-dimensions-svg-child/errors.json
index d35946678e..bd617771bb 100644
--- a/test/validator/samples/binding-dimensions-svg-child/errors.json
+++ b/test/validator/samples/binding-dimensions-svg-child/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on SVG elements",
-	"pos": 13,
+	"pos": 51,
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 7,
-		"character": 13
+		"character": 51
 	},
 	"end": {
-		"line": 2,
+		"line": 6,
 		"column": 23,
-		"character": 29
+		"character": 67
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg-child/input.svelte b/test/validator/samples/binding-dimensions-svg-child/input.svelte
index 8819dca703..c47dcc7237 100644
--- a/test/validator/samples/binding-dimensions-svg-child/input.svelte
+++ b/test/validator/samples/binding-dimensions-svg-child/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let offsetWidth;
+</script>
+
 <svg>
 	<text bind:offsetWidth>some text</text>
 </svg>
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg/errors.json b/test/validator/samples/binding-dimensions-svg/errors.json
index 930f577f22..157f2ee180 100644
--- a/test/validator/samples/binding-dimensions-svg/errors.json
+++ b/test/validator/samples/binding-dimensions-svg/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on <svg>. Use 'clientWidth' instead",
-	"pos": 5,
+	"pos": 43,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 43
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 21,
-		"character": 21
+		"character": 59
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg/input.svelte b/test/validator/samples/binding-dimensions-svg/input.svelte
index ced9988f8f..ae1b42085f 100644
--- a/test/validator/samples/binding-dimensions-svg/input.svelte
+++ b/test/validator/samples/binding-dimensions-svg/input.svelte
@@ -1 +1,5 @@
+<script>
+	let offsetWidth;
+</script>
+
 <svg bind:offsetWidth></svg>
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-void/errors.json b/test/validator/samples/binding-dimensions-void/errors.json
index 555cb33f5d..ddd4e359c4 100644
--- a/test/validator/samples/binding-dimensions-void/errors.json
+++ b/test/validator/samples/binding-dimensions-void/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on void elements like <img>. Use a wrapper element instead",
-	"pos": 22,
+	"pos": 60,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 22,
-		"character": 22
+		"character": 60
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 38,
-		"character": 38
+		"character": 76
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-void/input.svelte b/test/validator/samples/binding-dimensions-void/input.svelte
index 985f6b1930..e8a3fc4174 100644
--- a/test/validator/samples/binding-dimensions-void/input.svelte
+++ b/test/validator/samples/binding-dimensions-void/input.svelte
@@ -1 +1,5 @@
+<script>
+	let offsetWidth;
+</script>
+
 <img src='potato.jpg' bind:offsetWidth>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-checked/errors.json b/test/validator/samples/binding-input-checked/errors.json
index 92daa1d625..596bd1b4d7 100644
--- a/test/validator/samples/binding-input-checked/errors.json
+++ b/test/validator/samples/binding-input-checked/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-binding",
 	"message": "'checked' binding can only be used with <input type=\"checkbox\">",
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 7,
-		"character": 7
+		"character": 37
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 25,
-		"character": 25
+		"character": 55
 	},
-	"pos": 7
+	"pos": 37
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-checked/input.svelte b/test/validator/samples/binding-input-checked/input.svelte
index 13fc0b0faa..c01f924202 100644
--- a/test/validator/samples/binding-input-checked/input.svelte
+++ b/test/validator/samples/binding-input-checked/input.svelte
@@ -1 +1,5 @@
+<script>
+	let foo;
+</script>
+
 <input bind:checked={foo}>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-boolean/errors.json b/test/validator/samples/binding-input-type-boolean/errors.json
index a2cdc84928..fcf92356ae 100644
--- a/test/validator/samples/binding-input-type-boolean/errors.json
+++ b/test/validator/samples/binding-input-type-boolean/errors.json
@@ -2,14 +2,14 @@
 	"code": "missing-type",
 	"message": "'type' attribute must be specified",
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 24,
-		"character": 24
+		"character": 54
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 28,
-		"character": 28
+		"character": 58
 	},
-	"pos": 24
+	"pos": 54
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-boolean/input.svelte b/test/validator/samples/binding-input-type-boolean/input.svelte
index 2b3ae3263d..7cabca8a10 100644
--- a/test/validator/samples/binding-input-type-boolean/input.svelte
+++ b/test/validator/samples/binding-input-type-boolean/input.svelte
@@ -1 +1,5 @@
+<script>
+	let foo;
+</script>
+
 <input bind:value={foo} type>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-dynamic/errors.json b/test/validator/samples/binding-input-type-dynamic/errors.json
index 57cb256fc2..1e886a8e98 100644
--- a/test/validator/samples/binding-input-type-dynamic/errors.json
+++ b/test/validator/samples/binding-input-type-dynamic/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-type",
 	"message": "'type' attribute cannot be dynamic if input uses two-way binding",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 24,
-		"character": 24
+		"character": 70
 	},
 	"end": {
-		"line": 1,
-		"column": 42,
-		"character": 42
+		"line": 6,
+		"column": 40,
+		"character": 86
 	},
-	"pos": 24
+	"pos": 70
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-dynamic/input.svelte b/test/validator/samples/binding-input-type-dynamic/input.svelte
index 9ead3ba20f..e1c69e97d6 100644
--- a/test/validator/samples/binding-input-type-dynamic/input.svelte
+++ b/test/validator/samples/binding-input-type-dynamic/input.svelte
@@ -1 +1,6 @@
-<input bind:value={foo} type='{inputType}'>
\ No newline at end of file
+<script>
+	let foo;
+	let inputType;
+</script>
+
+<input bind:value={foo} type={inputType}>
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid-on-element/errors.json b/test/validator/samples/binding-invalid-on-element/errors.json
index 40a9bd7ea2..0db88e3447 100644
--- a/test/validator/samples/binding-invalid-on-element/errors.json
+++ b/test/validator/samples/binding-invalid-on-element/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'value' is not a valid binding on <div> elements",
-	"pos": 5,
+	"pos": 37,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 37
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 15,
-		"character": 15
+		"character": 47
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid-on-element/input.svelte b/test/validator/samples/binding-invalid-on-element/input.svelte
index 9b617e62be..7971dc5393 100644
--- a/test/validator/samples/binding-invalid-on-element/input.svelte
+++ b/test/validator/samples/binding-invalid-on-element/input.svelte
@@ -1 +1,5 @@
+<script>
+	let value;
+</script>
+
 <div bind:value></div>
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid/errors.json b/test/validator/samples/binding-invalid/errors.json
index 2254286d3f..5021da41b6 100644
--- a/test/validator/samples/binding-invalid/errors.json
+++ b/test/validator/samples/binding-invalid/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'whatever' is not a valid binding",
-	"pos": 5,
+	"pos": 40,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 40
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 18,
-		"character": 18
+		"character": 53
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid/input.svelte b/test/validator/samples/binding-invalid/input.svelte
index 8e5f874e5b..50df17c395 100644
--- a/test/validator/samples/binding-invalid/input.svelte
+++ b/test/validator/samples/binding-invalid/input.svelte
@@ -1 +1,5 @@
+<script>
+	let whatever;
+</script>
+
 <div bind:whatever></div>
\ No newline at end of file
diff --git a/test/validator/samples/binding-select-multiple-dynamic/errors.json b/test/validator/samples/binding-select-multiple-dynamic/errors.json
index 7795c69b16..d7710a201a 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/test/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -2,14 +2,14 @@
 	"code": "dynamic-multiple-attribute",
 	"message": "'multiple' attribute cannot be dynamic if select uses two-way binding",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 19,
-		"character": 19
+		"character": 66
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 29,
-		"character": 29
+		"character": 76
 	},
-	"pos": 19
+	"pos": 66
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-select-multiple-dynamic/input.svelte b/test/validator/samples/binding-select-multiple-dynamic/input.svelte
index 9e197c1b3d..6fb0df4d47 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/input.svelte
+++ b/test/validator/samples/binding-select-multiple-dynamic/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	let value;
+	let multiple;
+</script>
+
 <select bind:value {multiple}>
 	<option>1</option>
 	<option>2</option>
diff --git a/test/validator/samples/each-block-multiple-children/input.svelte b/test/validator/samples/each-block-multiple-children/input.svelte
index 384dce49b6..211ebed0c8 100644
--- a/test/validator/samples/each-block-multiple-children/input.svelte
+++ b/test/validator/samples/each-block-multiple-children/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let things;
+	export let soDoesThis;
+</script>
+
 {#each things as thing}
 	<span>this only exists...</span>
 	<span>...to increase test coverage</span>
diff --git a/test/validator/samples/empty-block/input.svelte b/test/validator/samples/empty-block/input.svelte
index 979ff837e9..4185f4f817 100644
--- a/test/validator/samples/empty-block/input.svelte
+++ b/test/validator/samples/empty-block/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let things = [];
+</script>
+
 {#each things as thing}
 
 {/each}
diff --git a/test/validator/samples/empty-block/warnings.json b/test/validator/samples/empty-block/warnings.json
index c26784952c..d563970425 100644
--- a/test/validator/samples/empty-block/warnings.json
+++ b/test/validator/samples/empty-block/warnings.json
@@ -3,30 +3,30 @@
 		"code": "empty-block",
 		"message": "Empty block",
 		"start": {
-			"line": 1,
+			"line": 5,
 			"column": 0,
-			"character": 0
+			"character": 38
 		},
 		"end": {
-			"line": 3,
+			"line": 7,
 			"column": 7,
-			"character": 32
+			"character": 70
 		},
-		"pos": 0
+		"pos": 38
 	},
 	{
 		"code": "empty-block",
 		"message": "Empty block",
 		"start": {
-			"line": 5,
+			"line": 9,
 			"column": 0,
-			"character": 34
+			"character": 72
 		},
 		"end": {
-			"line": 5,
+			"line": 9,
 			"column": 30,
-			"character": 64
+			"character": 102
 		},
-		"pos": 34
+		"pos": 72
 	}
 ]
\ No newline at end of file
diff --git a/test/validator/samples/non-empty-block-dev/input.svelte b/test/validator/samples/non-empty-block-dev/input.svelte
index ed4b9e6274..689f3fa2fe 100644
--- a/test/validator/samples/non-empty-block-dev/input.svelte
+++ b/test/validator/samples/non-empty-block-dev/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let x;
+</script>
+
 {#if x}
 	&nbsp;
 {/if}
\ No newline at end of file
diff --git a/test/validator/samples/select-multiple/input.svelte b/test/validator/samples/select-multiple/input.svelte
index 268e202c2e..14cba6b882 100644
--- a/test/validator/samples/select-multiple/input.svelte
+++ b/test/validator/samples/select-multiple/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let value;
+</script>
+
 <select bind:value multiple>
 	<option>1</option>
 </select>
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-declared-namespace/input.svelte b/test/validator/samples/svg-child-component-declared-namespace/input.svelte
index 3871f86c21..124265adb3 100644
--- a/test/validator/samples/svg-child-component-declared-namespace/input.svelte
+++ b/test/validator/samples/svg-child-component-declared-namespace/input.svelte
@@ -7,4 +7,4 @@
 	export let height;
 </script>
 
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+<rect x={x} y={y} width={width} height={height}/>
diff --git a/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte b/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte
index 8ba5698f05..b4b6fc86d7 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte
@@ -1 +1,8 @@
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
\ No newline at end of file
+<script>
+	export let x;
+	export let y;
+	export let width;
+	export let height;
+</script>
+
+<rect x={x} y={y} width={width} height={height}/>
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
index fc3d19a487..128b8628ed 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
@@ -2,14 +2,14 @@
 	"code": "missing-namespace",
 	"message": "<rect> is an SVG element – did you forget to add <svelte:options namespace=\"svg\"/> ?",
 	"start": {
-		"line": 1,
+		"line": 8,
 		"column": 0,
-		"character": 0
+		"character": 89
 	},
 	"end": {
-		"line": 1,
-		"column": 57,
-		"character": 57
+		"line": 8,
+		"column": 49,
+		"character": 138
 	},
-	"pos": 0
+	"pos": 89
 }]
diff --git a/test/validator/samples/window-binding-online/input.svelte b/test/validator/samples/window-binding-online/input.svelte
index 8684545304..99aa93b12d 100644
--- a/test/validator/samples/window-binding-online/input.svelte
+++ b/test/validator/samples/window-binding-online/input.svelte
@@ -1 +1,5 @@
+<script>
+	let online;
+</script>
+
 <svelte:window bind:online/>
\ No newline at end of file
diff --git a/test/vars/index.js b/test/vars/index.js
index 71617b8bf9..66ffd94c70 100644
--- a/test/vars/index.js
+++ b/test/vars/index.js
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as assert from 'assert';
 import { svelte, loadConfig, tryToLoadJson } from '../helpers.js';
 
-describe.only('vars', () => {
+describe('vars', () => {
 	fs.readdirSync('test/vars/samples').forEach(dir => {
 		if (dir[0] === '.') return;
 
