diff --git a/src/compile/Component.ts b/src/compile/Component.ts
index 09b7193f6f..f42412c630 100644
--- a/src/compile/Component.ts
+++ b/src/compile/Component.ts
@@ -604,7 +604,7 @@ function process_meta(component, nodes) {
 					case 'namespace':
 						if (!data) {
 							component.error(attribute, {
-								code: `invalid-meta-attribute`,
+								code: `invalid-${name}-attribute`,
 								message: `<svelte:meta> ${name} attribute must have a string value`
 							});
 						}
@@ -615,7 +615,7 @@ function process_meta(component, nodes) {
 					case 'immutable':
 						if (data && (data !== 'true' && data !== 'false')) {
 							component.error(attribute, {
-								code: `invalid-meta-attribute`,
+								code: `invalid-immutable-attribute`,
 								message: `<svelte:meta> immutable attribute must be true or false`
 							});
 						}
@@ -633,7 +633,7 @@ function process_meta(component, nodes) {
 			else if (attribute.type === 'Binding') {
 				if (attribute.name !== 'props') {
 					component.error(attribute, {
-						code: `invalid-meta-attribute`,
+						code: `invalid-meta-binding`,
 						message: `<svelte:meta> only supports bind:props`
 					});
 				}
diff --git a/test/validator/samples/action-on-component/errors.json b/test/validator/samples/action-on-component/errors.json
index 21ab463d8d..596ef16482 100644
--- a/test/validator/samples/action-on-component/errors.json
+++ b/test/validator/samples/action-on-component/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-action",
 	"message": "Actions can only be applied to DOM elements, not components",
-	"pos": 8,
+	"pos": 84,
 	"start": {
-		"line": 1,
+		"line": 7,
 		"column": 8,
-		"character": 8
+		"character": 84
 	},
 	"end": {
-		"line": 1,
+		"line": 7,
 		"column": 15,
-		"character": 15
+		"character": 91
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/action-on-component/input.html b/test/validator/samples/action-on-component/input.html
index a59dc6ef89..788bedaa94 100644
--- a/test/validator/samples/action-on-component/input.html
+++ b/test/validator/samples/action-on-component/input.html
@@ -1,15 +1,7 @@
-<Widget use:foo/>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: {
-			Widget
-		},
+	function foo(){}
+</script>
 
-		actions: {
-			foo() {}
-		}
-	};
-</script>
\ No newline at end of file
+<Widget use:foo/>
\ No newline at end of file
diff --git a/test/validator/samples/animation-duplicate/errors.json b/test/validator/samples/animation-duplicate/errors.json
index 7eaa285b85..a09edd54c7 100644
--- a/test/validator/samples/animation-duplicate/errors.json
+++ b/test/validator/samples/animation-duplicate/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-animation",
 	"message": "An element can only have one 'animate' directive",
 	"start": {
-		"line": 2,
+		"line": 7,
 		"column": 18,
-		"character": 50
+		"character": 108
 	},
 	"end": {
-		"line": 2,
+		"line": 7,
 		"column": 29,
-		"character": 61
+		"character": 119
 	},
-	"pos": 50
+	"pos": 108
 }]
\ No newline at end of file
diff --git a/test/validator/samples/animation-duplicate/input.html b/test/validator/samples/animation-duplicate/input.html
index 031d74fc3c..f58dc3e1cc 100644
--- a/test/validator/samples/animation-duplicate/input.html
+++ b/test/validator/samples/animation-duplicate/input.html
@@ -1,17 +1,8 @@
-{#each things as thing (thing)}
-	<div animate:foo animate:bar></div>
-{/each}
-
 <script>
-	export default {
-		animations: {
-			foo(node, animation, params) {
-				// ...
-			},
+	function foo() {}
+	function bar() {}
+</script>
 
-			bar(node, animation, params) {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{#each things as thing (thing)}
+	<div animate:foo animate:bar></div>
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/animation-not-in-each/errors.json b/test/validator/samples/animation-not-in-each/errors.json
index c4cfc92344..67e2ceb7c2 100644
--- a/test/validator/samples/animation-not-in-each/errors.json
+++ b/test/validator/samples/animation-not-in-each/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-animation",
 	"message": "An element that use the animate directive must be the immediate child of a keyed each block",
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 44
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 16,
-		"character": 16
+		"character": 55
 	},
-	"pos": 5
+	"pos": 44
 }]
\ No newline at end of file
diff --git a/test/validator/samples/animation-not-in-each/input.html b/test/validator/samples/animation-not-in-each/input.html
index 0349debc80..33033302d5 100644
--- a/test/validator/samples/animation-not-in-each/input.html
+++ b/test/validator/samples/animation-not-in-each/input.html
@@ -1,11 +1,5 @@
-<div animate:foo></div>
-
 <script>
-	export default {
-		animations: {
-			foo(node, animation, params) {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+</script>
+
+<div animate:foo></div>
\ No newline at end of file
diff --git a/test/validator/samples/animation-not-in-keyed-each/errors.json b/test/validator/samples/animation-not-in-keyed-each/errors.json
index 751a39aff1..1081589e6f 100644
--- a/test/validator/samples/animation-not-in-keyed-each/errors.json
+++ b/test/validator/samples/animation-not-in-keyed-each/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-animation",
 	"message": "An element that use the animate directive must be the immediate child of a keyed each block",
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 6,
-		"character": 30
+		"character": 69
 	},
 	"end": {
-		"line": 2,
+		"line": 6,
 		"column": 17,
-		"character": 41
+		"character": 80
 	},
-	"pos": 30
+	"pos": 69
 }]
\ No newline at end of file
diff --git a/test/validator/samples/animation-not-in-keyed-each/input.html b/test/validator/samples/animation-not-in-keyed-each/input.html
index 98859a0b6e..626838ab84 100644
--- a/test/validator/samples/animation-not-in-keyed-each/input.html
+++ b/test/validator/samples/animation-not-in-keyed-each/input.html
@@ -1,14 +1,8 @@
+<script>
+	function foo() {}
+</script>
+
 {#each things as thing}
 	<div animate:foo></div>
 	<div animate:foo></div>
-{/each}
-
-<script>
-	export default {
-		animations: {
-			foo(node, animation, params) {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/animation-siblings/errors.json b/test/validator/samples/animation-siblings/errors.json
index 1661eb63d9..af15113b94 100644
--- a/test/validator/samples/animation-siblings/errors.json
+++ b/test/validator/samples/animation-siblings/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-animation",
 	"message": "An element that use the animate directive must be the sole child of a keyed each block",
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 6,
-		"character": 38
+		"character": 77
 	},
 	"end": {
-		"line": 2,
+		"line": 6,
 		"column": 17,
-		"character": 49
+		"character": 88
 	},
-	"pos": 38
+	"pos": 77
 }]
\ No newline at end of file
diff --git a/test/validator/samples/animation-siblings/input.html b/test/validator/samples/animation-siblings/input.html
index cd9c6f1293..6ec203bd74 100644
--- a/test/validator/samples/animation-siblings/input.html
+++ b/test/validator/samples/animation-siblings/input.html
@@ -1,14 +1,8 @@
+<script>
+	function foo() {}
+</script>
+
 {#each things as thing (thing)}
 	<div animate:foo></div>
 	<div animate:foo></div>
-{/each}
-
-<script>
-	export default {
-		animations: {
-			foo(node, animation, params) {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/component-cannot-be-called-state/errors.json b/test/validator/samples/component-cannot-be-called-state/errors.json
deleted file mode 100644
index 764a582c53..0000000000
--- a/test/validator/samples/component-cannot-be-called-state/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-name",
-	"message": "Component constructors cannot be called 'state' due to technical limitations",
-	"pos": 73,
-	"start": {
-		"line": 6,
-		"column": 3,
-		"character": 73
-	},
-	"end": {
-		"line": 6,
-		"column": 8,
-		"character": 78
-	}
-}]
diff --git a/test/validator/samples/component-cannot-be-called-state/input.html b/test/validator/samples/component-cannot-be-called-state/input.html
deleted file mode 100644
index 33f42f04b2..0000000000
--- a/test/validator/samples/component-cannot-be-called-state/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	import state from 'foo';
-
-	export default {
-		components: {
-			state
-		}
-	};
-</script>
diff --git a/test/validator/samples/component-slot-dynamic-attribute/errors.json b/test/validator/samples/component-slot-dynamic-attribute/errors.json
index 5aac307fa3..6108b89bfb 100644
--- a/test/validator/samples/component-slot-dynamic-attribute/errors.json
+++ b/test/validator/samples/component-slot-dynamic-attribute/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-slot-attribute",
 	"message": "slot attribute cannot have a dynamic value",
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 9,
-		"character": 18
+		"character": 75
 	},
 	"end": {
-		"line": 2,
-		"column": 21,
-		"character": 30
+		"line": 6,
+		"column": 19,
+		"character": 85
 	},
-	"pos": 18
+	"pos": 75
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-dynamic-attribute/input.html b/test/validator/samples/component-slot-dynamic-attribute/input.html
index 436bb32f46..83e1df8aa2 100644
--- a/test/validator/samples/component-slot-dynamic-attribute/input.html
+++ b/test/validator/samples/component-slot-dynamic-attribute/input.html
@@ -1,11 +1,7 @@
-<Nested>
-	<button slot='{foo}'>click me</button>
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
+</script>
 
-	export default {
-		components: { Nested }
-	};
-</script>
\ No newline at end of file
+<Nested>
+	<button slot={foo}>click me</button>
+</Nested>
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-each-block/errors.json b/test/validator/samples/component-slotted-each-block/errors.json
index 3c96ba22ae..b2ae858fb6 100644
--- a/test/validator/samples/component-slotted-each-block/errors.json
+++ b/test/validator/samples/component-slotted-each-block/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-slotted-content",
 	"message": "Cannot place slotted elements inside an each-block",
 	"start": {
-		"line": 3,
+		"line": 7,
 		"column": 7,
-		"character": 41
+		"character": 98
 	},
 	"end": {
-		"line": 3,
+		"line": 7,
 		"column": 17,
-		"character": 51
+		"character": 108
 	},
-	"pos": 41
+	"pos": 98
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-each-block/input.html b/test/validator/samples/component-slotted-each-block/input.html
index dca4980f30..2c053a1e6c 100644
--- a/test/validator/samples/component-slotted-each-block/input.html
+++ b/test/validator/samples/component-slotted-each-block/input.html
@@ -1,15 +1,9 @@
+<script>
+	import Nested from './Nested.html';
+</script>
+
 <Nested>
 	{#each things as thing}
 		<div slot='foo'>{thing}</div>
 	{/each}
-</Nested>
-
-<script>
-	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+</Nested>
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-if-block/errors.json b/test/validator/samples/component-slotted-if-block/errors.json
index fe772659db..bd3ef87fad 100644
--- a/test/validator/samples/component-slotted-if-block/errors.json
+++ b/test/validator/samples/component-slotted-if-block/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-slotted-content",
 	"message": "Cannot place slotted elements inside an if-block",
 	"start": {
-		"line": 3,
+		"line": 7,
 		"column": 7,
-		"character": 29
+		"character": 86
 	},
 	"end": {
-		"line": 3,
+		"line": 7,
 		"column": 17,
-		"character": 39
+		"character": 96
 	},
-	"pos": 29
+	"pos": 86
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-if-block/input.html b/test/validator/samples/component-slotted-if-block/input.html
index c620019799..eda6bc2e13 100644
--- a/test/validator/samples/component-slotted-if-block/input.html
+++ b/test/validator/samples/component-slotted-if-block/input.html
@@ -1,15 +1,9 @@
+<script>
+	import Nested from './Nested.html';
+</script>
+
 <Nested>
 	{#if thing}
 		<div slot='foo'>{thing}</div>
 	{/if}
-</Nested>
-
-<script>
-	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+</Nested>
\ No newline at end of file
diff --git a/test/validator/samples/default-export/errors.json b/test/validator/samples/default-export/errors.json
new file mode 100644
index 0000000000..45544fe4a1
--- /dev/null
+++ b/test/validator/samples/default-export/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "default-export",
+	"message": "A component cannot have a default export",
+	"pos": 10,
+	"start": {
+		"line": 2,
+		"column": 1,
+		"character": 10
+	},
+	"end": {
+		"line": 2,
+		"column": 19,
+		"character": 28
+	}
+}]
diff --git a/test/validator/samples/default-export/input.html b/test/validator/samples/default-export/input.html
new file mode 100644
index 0000000000..6d7ea95370
--- /dev/null
+++ b/test/validator/samples/default-export/input.html
@@ -0,0 +1,3 @@
+<script>
+	export default 42;
+</script>
diff --git a/test/validator/samples/event-handler-ref-invalid/errors.json b/test/validator/samples/event-handler-ref-invalid/errors.json
deleted file mode 100644
index 05c2fed01c..0000000000
--- a/test/validator/samples/event-handler-ref-invalid/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "missing-ref",
-	"message": "'refs.inputx' does not exist (did you mean 'refs.input'?)",
-	"pos": 36,
-	"start": {
-		"line": 2,
-		"column": 18,
-		"character": 36
-	},
-	"end": {
-		"line": 2,
-		"column": 35,
-		"character": 53
-	}
-}]
\ No newline at end of file
diff --git a/test/validator/samples/event-handler-ref-invalid/input.html b/test/validator/samples/event-handler-ref-invalid/input.html
deleted file mode 100644
index f6cbe90c3a..0000000000
--- a/test/validator/samples/event-handler-ref-invalid/input.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<input ref:input>
-<button on:click='refs.inputx.focus()'>focus input</button>
\ No newline at end of file
diff --git a/test/validator/samples/event-handler-ref/input.html b/test/validator/samples/event-handler-ref/input.html
deleted file mode 100644
index 605b2db099..0000000000
--- a/test/validator/samples/event-handler-ref/input.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<input ref:input>
-<button on:click='{() => refs.input.focus()}'>focus input</button>
\ No newline at end of file
diff --git a/test/validator/samples/event-handler-ref/warnings.json b/test/validator/samples/event-handler-ref/warnings.json
deleted file mode 100644
index 0637a088a0..0000000000
--- a/test/validator/samples/event-handler-ref/warnings.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/test/validator/samples/helper-clash-context/input.html b/test/validator/samples/helper-clash-context/input.html
deleted file mode 100644
index 7ddee0b901..0000000000
--- a/test/validator/samples/helper-clash-context/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-	export let things = [ 'a', 'b', 'c' ];
-
-	function thing(x) {
-		return x;
-	}
-</script>
-
-{#each things as thing}
-	{thing}
-{/each}
\ No newline at end of file
diff --git a/test/validator/samples/helper-clash-context/warnings.json b/test/validator/samples/helper-clash-context/warnings.json
deleted file mode 100644
index 5fa69990a3..0000000000
--- a/test/validator/samples/helper-clash-context/warnings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "each-context-clash",
-	"message": "Context clashes with a helper. Rename one or the other to eliminate any ambiguity",
-	"start": {
-		"line": 1,
-		"column": 17,
-		"character": 17
-	},
-	"end": {
-		"line": 1,
-		"column": 22,
-		"character": 22
-	},
-	"pos": 17
-}]
\ No newline at end of file
diff --git a/test/validator/samples/named-export/errors.json b/test/validator/samples/named-export/errors.json
deleted file mode 100644
index 705aac69c2..0000000000
--- a/test/validator/samples/named-export/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "named-export",
-	"message": "A component can only have a default export",
-	"pos": 10,
-	"start": {
-		"line": 2,
-		"column": 1,
-		"character": 10
-	},
-	"end": {
-		"line": 2,
-		"column": 21,
-		"character": 30
-	}
-}]
diff --git a/test/validator/samples/named-export/input.html b/test/validator/samples/named-export/input.html
deleted file mode 100644
index 269a7cc214..0000000000
--- a/test/validator/samples/named-export/input.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-	export var foo = 42;
-</script>
diff --git a/test/validator/samples/namespace-invalid-unguessable/input.html b/test/validator/samples/namespace-invalid-unguessable/input.html
index 26494e2112..1f8500503d 100644
--- a/test/validator/samples/namespace-invalid-unguessable/input.html
+++ b/test/validator/samples/namespace-invalid-unguessable/input.html
@@ -1,5 +1 @@
-<script>
-	export default {
-		namespace: 'lol'
-	};
-</script>
\ No newline at end of file
+<svelte:meta namespace="lol"/>
\ No newline at end of file
diff --git a/test/validator/samples/namespace-invalid/input.html b/test/validator/samples/namespace-invalid/input.html
index a2e5baf39b..6999e7ee02 100644
--- a/test/validator/samples/namespace-invalid/input.html
+++ b/test/validator/samples/namespace-invalid/input.html
@@ -1,5 +1 @@
-<script>
-	export default {
-		namespace: 'http://www.w3.org/1999/svg'
-	};
-</script>
\ No newline at end of file
+<svelte:meta namespace="http://www.w3.org/1999/svg"/>
\ No newline at end of file
diff --git a/test/validator/samples/namespace-non-literal/errors.json b/test/validator/samples/namespace-non-literal/errors.json
index 4e001f6ed6..cd98748408 100644
--- a/test/validator/samples/namespace-non-literal/errors.json
+++ b/test/validator/samples/namespace-non-literal/errors.json
@@ -1,6 +1,6 @@
 [{
-	"code": "invalid-namespace-property",
-	"message": "The 'namespace' property must be a string literal representing a valid namespace",
+	"code": "invalid-namespace-attribute",
+	"message": "The 'namespace' attribute must be a string literal representing a valid namespace",
 	"pos": 79,
 	"start": {
 		"line": 5,
diff --git a/test/validator/samples/namespace-non-literal/input.html b/test/validator/samples/namespace-non-literal/input.html
index 41bb790c37..5f88f6d899 100644
--- a/test/validator/samples/namespace-non-literal/input.html
+++ b/test/validator/samples/namespace-non-literal/input.html
@@ -1,7 +1 @@
-<script>
-	const namespace = 'http://www.w3.org/1999/svg';
-
-	export default {
-		namespace
-	};
-</script>
\ No newline at end of file
+<svelte:meta namespace={ns}/>
\ No newline at end of file
diff --git a/test/validator/samples/tag-invalid/input.html b/test/validator/samples/tag-invalid/input.html
index 3b6cc30fbe..9054644cac 100644
--- a/test/validator/samples/tag-invalid/input.html
+++ b/test/validator/samples/tag-invalid/input.html
@@ -1,5 +1 @@
-<script>
-	export default {
-		tag: 'invalid'
-	};
-</script>
\ No newline at end of file
+<svelte:meta tag="invalid"/>
\ No newline at end of file
diff --git a/test/validator/samples/tag-non-string/errors.json b/test/validator/samples/tag-non-string/errors.json
index b55aa83cb4..48048f584e 100644
--- a/test/validator/samples/tag-non-string/errors.json
+++ b/test/validator/samples/tag-non-string/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-tag-property",
+	"code": "invalid-tag-attribute",
 	"message": "'tag' must be a string literal",
 	"start": {
 		"line": 3,
diff --git a/test/validator/samples/tag-non-string/input.html b/test/validator/samples/tag-non-string/input.html
index bbb14e387c..4cf1a63eec 100644
--- a/test/validator/samples/tag-non-string/input.html
+++ b/test/validator/samples/tag-non-string/input.html
@@ -1,5 +1 @@
-<script>
-	export default {
-		tag: 42
-	};
-</script>
\ No newline at end of file
+<svelte:meta tag={42}/>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in-transition/errors.json b/test/validator/samples/transition-duplicate-in-transition/errors.json
index bb52635630..955411d2ad 100644
--- a/test/validator/samples/transition-duplicate-in-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-in-transition/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element cannot have both an 'in' directive and a 'transition' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 12,
-		"character": 12
+		"character": 70
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 26,
-		"character": 26
+		"character": 84
 	},
-	"pos": 12
+	"pos": 70
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in-transition/input.html b/test/validator/samples/transition-duplicate-in-transition/input.html
index 6f47e754f4..aa7f72847b 100644
--- a/test/validator/samples/transition-duplicate-in-transition/input.html
+++ b/test/validator/samples/transition-duplicate-in-transition/input.html
@@ -1,10 +1,6 @@
-<div in:foo transition:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div in:foo transition:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in/errors.json b/test/validator/samples/transition-duplicate-in/errors.json
index b989855594..9a030a9ca2 100644
--- a/test/validator/samples/transition-duplicate-in/errors.json
+++ b/test/validator/samples/transition-duplicate-in/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element can only have one 'in' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 12,
-		"character": 12
+		"character": 70
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 18,
-		"character": 18
+		"character": 76
 	},
-	"pos": 12
+	"pos": 70
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in/input.html b/test/validator/samples/transition-duplicate-in/input.html
index b9a9218f8e..d1bc020347 100644
--- a/test/validator/samples/transition-duplicate-in/input.html
+++ b/test/validator/samples/transition-duplicate-in/input.html
@@ -1,10 +1,6 @@
-<div in:foo in:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div in:foo in:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out-transition/errors.json b/test/validator/samples/transition-duplicate-out-transition/errors.json
index ee8c2aa8a6..ec96e2804c 100644
--- a/test/validator/samples/transition-duplicate-out-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-out-transition/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element cannot have both an 'out' directive and a 'transition' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 13,
-		"character": 13
+		"character": 71
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 27,
-		"character": 27
+		"character": 85
 	},
-	"pos": 13
+	"pos": 71
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out-transition/input.html b/test/validator/samples/transition-duplicate-out-transition/input.html
index ae2582b942..80efc85607 100644
--- a/test/validator/samples/transition-duplicate-out-transition/input.html
+++ b/test/validator/samples/transition-duplicate-out-transition/input.html
@@ -1,10 +1,6 @@
-<div out:foo transition:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div out:foo transition:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out/errors.json b/test/validator/samples/transition-duplicate-out/errors.json
index db69c741c6..8465cca2b3 100644
--- a/test/validator/samples/transition-duplicate-out/errors.json
+++ b/test/validator/samples/transition-duplicate-out/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element can only have one 'out' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 13,
-		"character": 13
+		"character": 71
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 20,
-		"character": 20
+		"character": 78
 	},
-	"pos": 13
+	"pos": 71
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out/input.html b/test/validator/samples/transition-duplicate-out/input.html
index 949dae8638..70442f85e5 100644
--- a/test/validator/samples/transition-duplicate-out/input.html
+++ b/test/validator/samples/transition-duplicate-out/input.html
@@ -1,10 +1,6 @@
-<div out:foo out:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div out:foo out:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-in/errors.json b/test/validator/samples/transition-duplicate-transition-in/errors.json
index 5f03fe331f..eb441184bd 100644
--- a/test/validator/samples/transition-duplicate-transition-in/errors.json
+++ b/test/validator/samples/transition-duplicate-transition-in/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element cannot have both a 'transition' directive and an 'in' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 20,
-		"character": 20
+		"character": 78
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 26,
-		"character": 26
+		"character": 84
 	},
-	"pos": 20
+	"pos": 78
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-in/input.html b/test/validator/samples/transition-duplicate-transition-in/input.html
index bc105c2079..dd3ad9a2be 100644
--- a/test/validator/samples/transition-duplicate-transition-in/input.html
+++ b/test/validator/samples/transition-duplicate-transition-in/input.html
@@ -1,10 +1,6 @@
-<div transition:foo in:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div transition:foo in:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-out/errors.json b/test/validator/samples/transition-duplicate-transition-out/errors.json
index 5f3b73b35a..e8886067c6 100644
--- a/test/validator/samples/transition-duplicate-transition-out/errors.json
+++ b/test/validator/samples/transition-duplicate-transition-out/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element cannot have both a 'transition' directive and an 'out' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 20,
-		"character": 20
+		"character": 78
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 27,
-		"character": 27
+		"character": 85
 	},
-	"pos": 20
+	"pos": 78
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-out/input.html b/test/validator/samples/transition-duplicate-transition-out/input.html
index ac82cb064e..aafd0c548a 100644
--- a/test/validator/samples/transition-duplicate-transition-out/input.html
+++ b/test/validator/samples/transition-duplicate-transition-out/input.html
@@ -1,10 +1,6 @@
-<div transition:foo out:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div transition:foo out:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition/errors.json b/test/validator/samples/transition-duplicate-transition/errors.json
index b855f2e63f..2b265d3a72 100644
--- a/test/validator/samples/transition-duplicate-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-transition/errors.json
@@ -2,14 +2,14 @@
 	"code": "duplicate-transition",
 	"message": "An element can only have one 'transition' directive",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 20,
-		"character": 20
+		"character": 78
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 34,
-		"character": 34
+		"character": 92
 	},
-	"pos": 20
+	"pos": 78
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition/input.html b/test/validator/samples/transition-duplicate-transition/input.html
index 29af279564..6af44914e0 100644
--- a/test/validator/samples/transition-duplicate-transition/input.html
+++ b/test/validator/samples/transition-duplicate-transition/input.html
@@ -1,10 +1,6 @@
-<div transition:foo transition:bar>...</div>
-
 <script>
-	export default {
-		transitions: {
-			foo,
-			bar
-		}
-	};
-</script>
\ No newline at end of file
+	function foo() {}
+	function bar() {}
+</script>
+
+<div transition:foo transition:bar>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/transition-on-component/errors.json b/test/validator/samples/transition-on-component/errors.json
index 1a3fb465e3..bee8bf7539 100644
--- a/test/validator/samples/transition-on-component/errors.json
+++ b/test/validator/samples/transition-on-component/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-transition",
 	"message": "Transitions can only be applied to DOM elements, not components",
 	"start": {
-		"line": 1,
+		"line": 7,
 		"column": 8,
-		"character": 8
+		"character": 85
 	},
 	"end": {
-		"line": 1,
+		"line": 7,
 		"column": 14,
-		"character": 14
+		"character": 91
 	},
-	"pos": 8
+	"pos": 85
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-on-component/input.html b/test/validator/samples/transition-on-component/input.html
index c5ada08ece..392f346424 100644
--- a/test/validator/samples/transition-on-component/input.html
+++ b/test/validator/samples/transition-on-component/input.html
@@ -1,15 +1,7 @@
-<Widget in:foo/>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: {
-			Widget
-		},
+	function foo() {}
+</script>
 
-		transitions: {
-			foo() {}
-		}
-	};
-</script>
\ No newline at end of file
+<Widget in:foo/>
\ No newline at end of file