diff --git a/test/css/samples/omit-scoping-attribute-class-dynamic/input.html b/test/css/samples/omit-scoping-attribute-class-dynamic/input.html
index 40c8ad0b32..63743b1dae 100644
--- a/test/css/samples/omit-scoping-attribute-class-dynamic/input.html
+++ b/test/css/samples/omit-scoping-attribute-class-dynamic/input.html
@@ -1,3 +1,7 @@
+<script>
+	export let unknown = 'whatever';
+</script>
+
 <p class='{unknown}'>this is styled</p>
 <p class='bar'>this is unstyled</p>
 
@@ -5,14 +9,4 @@
 	.foo {
 		color: red;
 	}
-</style>
-
-<script>
-	export default {
-		data () {
-			return {
-				unknown: 'whatever'
-			};
-		}
-	};
-</script>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/test/custom-elements/samples/custom-method/main.html b/test/custom-elements/samples/custom-method/main.html
index b388472f23..8b85a52575 100644
--- a/test/custom-elements/samples/custom-method/main.html
+++ b/test/custom-elements/samples/custom-method/main.html
@@ -1,13 +1,11 @@
-<p>{foo}</p>
+<svelte:meta tag="custom-element"/>
 
 <script>
-	export default {
-		tag: 'custom-element',
+	export function updateFoo(value) {
+		foo = value;
+	}
 
-		methods: {
-			updateFoo(value) {
-				this.foo = value;
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	export let foo;
+</script>
+
+<p>{foo}</p>
\ No newline at end of file
diff --git a/test/custom-elements/samples/escaped-css/main.html b/test/custom-elements/samples/escaped-css/main.html
index 1f86593b8f..0a28900d85 100644
--- a/test/custom-elements/samples/escaped-css/main.html
+++ b/test/custom-elements/samples/escaped-css/main.html
@@ -1,13 +1,9 @@
+<svelte:meta tag="custom-element"/>
+
 <span class='icon'></span>
 
 <style>
 	.icon::before {
 		content: '\ff'
 	}
-</style>
-
-<script>
-	export default {
-		tag: 'custom-element'
-	};
-</script>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/test/custom-elements/samples/html-slots/main.html b/test/custom-elements/samples/html-slots/main.html
index 7a8e47c7ee..fbc70b0aeb 100644
--- a/test/custom-elements/samples/html-slots/main.html
+++ b/test/custom-elements/samples/html-slots/main.html
@@ -1,3 +1,5 @@
+<svelte:meta tag="custom-element"/>
+
 <div>
 	<slot>
 		<p>default fallback content</p>
@@ -6,10 +8,4 @@
 	<slot name='foo'>
 		<p>foo fallback content</p>
 	</slot>
-</div>
-
-<script>
-	export default {
-		tag: 'custom-element'
-	};
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/test/custom-elements/samples/html/main.html b/test/custom-elements/samples/html/main.html
index 67b0fa792c..4765b5a151 100644
--- a/test/custom-elements/samples/html/main.html
+++ b/test/custom-elements/samples/html/main.html
@@ -1,7 +1,7 @@
-<h1>Hello {name}!</h1>
+<svelte:meta tag="custom-element"/>
 
 <script>
-	export default {
-		tag: 'custom-element'
-	};
-</script>
\ No newline at end of file
+	export let name;
+</script>
+
+<h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/custom-elements/samples/nested/Counter.html b/test/custom-elements/samples/nested/Counter.html
index c25db21ac8..d365ce7644 100644
--- a/test/custom-elements/samples/nested/Counter.html
+++ b/test/custom-elements/samples/nested/Counter.html
@@ -1,13 +1,7 @@
-<button on:click='set({ count: count + 1 })'>count: {count}</button>
+<svelte:meta tag="my-counter"/>
 
 <script>
-	export default {
-		tag: 'my-counter',
+	export let count = 0;
+</script>
 
-		data() {
-			return {
-				count: 0
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<button on:click='{() => count += 1}'>count: {count}</button>
\ No newline at end of file
diff --git a/test/custom-elements/samples/nested/main.html b/test/custom-elements/samples/nested/main.html
index f930d78a28..3e80f6015e 100644
--- a/test/custom-elements/samples/nested/main.html
+++ b/test/custom-elements/samples/nested/main.html
@@ -1,12 +1,10 @@
-<Counter bind:count/>
-<p>clicked {count} times</p>
+<svelte:meta tag="my-app"/>
 
 <script>
 	import Counter from './Counter.html';
 
-	export default {
-		tag: 'my-app',
+	export let count;
+</script>
 
-		components: { Counter }
-	};
-</script>
\ No newline at end of file
+<Counter bind:count/>
+<p>clicked {count} times</p>
\ No newline at end of file
diff --git a/test/custom-elements/samples/new-styled/main.html b/test/custom-elements/samples/new-styled/main.html
index 4163b0732d..be1b397fa5 100644
--- a/test/custom-elements/samples/new-styled/main.html
+++ b/test/custom-elements/samples/new-styled/main.html
@@ -1,13 +1,9 @@
+<svelte:meta tag="custom-element"/>
+
 <p>styled</p>
 
 <style>
 	p {
 		color: red;
 	}
-</style>
-
-<script>
-	export default {
-		tag: 'custom-element'
-	};
-</script>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/test/custom-elements/samples/new/main.html b/test/custom-elements/samples/new/main.html
index 67b0fa792c..4765b5a151 100644
--- a/test/custom-elements/samples/new/main.html
+++ b/test/custom-elements/samples/new/main.html
@@ -1,7 +1,7 @@
-<h1>Hello {name}!</h1>
+<svelte:meta tag="custom-element"/>
 
 <script>
-	export default {
-		tag: 'custom-element'
-	};
-</script>
\ No newline at end of file
+	export let name;
+</script>
+
+<h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/custom-elements/samples/no-missing-prop-warnings/main.html b/test/custom-elements/samples/no-missing-prop-warnings/main.html
index 61d4e837f8..a9baee2faf 100644
--- a/test/custom-elements/samples/no-missing-prop-warnings/main.html
+++ b/test/custom-elements/samples/no-missing-prop-warnings/main.html
@@ -1,8 +1,9 @@
-<p>foo: {foo}</p>
-<p>bar: {bar}</p>
+<svelte:meta tag="my-app"/>
 
 <script>
-	export default {
-		tag: 'my-app'
-	};
-</script>
\ No newline at end of file
+	export let foo;
+	export let bar;
+</script>
+
+<p>foo: {foo}</p>
+<p>bar: {bar}</p>
\ No newline at end of file
diff --git a/test/custom-elements/samples/oncreate/main.html b/test/custom-elements/samples/oncreate/main.html
index 0c9b1b5c12..7854aeec02 100644
--- a/test/custom-elements/samples/oncreate/main.html
+++ b/test/custom-elements/samples/oncreate/main.html
@@ -1,9 +1,12 @@
+<svelte:meta tag="my-app"/>
+
 <script>
-	export default {
-		tag: 'my-app',
-
-		oncreate() {
-			this.wasCreated = true;
-		}
-	};
-</script>
\ No newline at end of file
+	import { onmount } from 'svelte';
+
+	export let wasCreated;
+
+	onmount(() => {
+		wasCreated = true;
+	});
+</script>
+
diff --git a/test/custom-elements/samples/props/main.html b/test/custom-elements/samples/props/main.html
index db8465591e..bee06784e4 100644
--- a/test/custom-elements/samples/props/main.html
+++ b/test/custom-elements/samples/props/main.html
@@ -1,15 +1,9 @@
-<my-widget class="foo" {items}/>
+<svelte:meta tag="custom-element"/>
 
 <script>
 	import './my-widget.html';
 
-	export default {
-		tag: 'custom-element',
+	export let items = ['a', 'b', 'c'];
+</script>
 
-		data() {
-			return {
-				items: ['a', 'b', 'c']
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<my-widget class="foo" {items}/>
\ No newline at end of file
diff --git a/test/custom-elements/samples/props/my-widget.html b/test/custom-elements/samples/props/my-widget.html
index b4ed9b38a6..6aabe5a73b 100644
--- a/test/custom-elements/samples/props/my-widget.html
+++ b/test/custom-elements/samples/props/my-widget.html
@@ -1,14 +1,8 @@
-<p>{items.length} items</p>
-<p>{items.join(', ')}</p>
+<svelte:meta tag="my-widget"/>
 
 <script>
-	export default {
-		tag: 'my-widget',
+	export let items = [];
+</script>
 
-		data() {
-			return {
-				items: []
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<p>{items.length} items</p>
+<p>{items.join(', ')}</p>
\ No newline at end of file
diff --git a/test/hydration/samples/component-in-element/main.html b/test/hydration/samples/component-in-element/main.html
index d639570c56..4367a831ea 100644
--- a/test/hydration/samples/component-in-element/main.html
+++ b/test/hydration/samples/component-in-element/main.html
@@ -1,13 +1,7 @@
-<div>
-	<Nested/>
-</div>
-
 <script>
 	import Nested from './Nested.html';
+</script>
 
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+<div>
+	<Nested/>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/component/main.html b/test/hydration/samples/component/main.html
index c669ca09a8..583835f46a 100644
--- a/test/hydration/samples/component/main.html
+++ b/test/hydration/samples/component/main.html
@@ -1,11 +1,5 @@
-<Nested/>
-
 <script>
 	import Nested from './Nested.html';
+</script>
 
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+<Nested/>
\ No newline at end of file
diff --git a/test/hydration/samples/each-block-arg-clash/main.html b/test/hydration/samples/each-block-arg-clash/main.html
index f42706e152..7f04cd5e2f 100644
--- a/test/hydration/samples/each-block-arg-clash/main.html
+++ b/test/hydration/samples/each-block-arg-clash/main.html
@@ -2,4 +2,4 @@
 	{#each things.foo as foo}
 		<li>{foo}</li>
 	{/each}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/main.html b/test/hydration/samples/event-handler/main.html
index 83ecadb0d6..d51636617f 100644
--- a/test/hydration/samples/event-handler/main.html
+++ b/test/hydration/samples/event-handler/main.html
@@ -1,4 +1,4 @@
-<button on:click='set({ clicked: true })'>click me</button>
+<button on:click='{() => clicked = true}'>click me</button>
 
 {#if clicked}
 	<p>clicked!</p>
diff --git a/test/js/samples/action/input.html b/test/js/samples/action/input.html
index 5b42061fe5..713e44249a 100644
--- a/test/js/samples/action/input.html
+++ b/test/js/samples/action/input.html
@@ -1,23 +1,19 @@
-<a href="#" use:link>Test</a>
-
 <script>
-  export default {
-    actions: {
-      link(node) {
-        
-        function onClick(event) {
-          event.preventDefault();
-          history.pushState(null, null, event.target.href);
-        }
+  function link(node) {
+    
+    function onClick(event) {
+      event.preventDefault();
+      history.pushState(null, null, event.target.href);
+    }
 
-        node.addEventListener('click', onClick);
+    node.addEventListener('click', onClick);
 
-        return {
-          destroy() {
-            node.removeEventListener('click', onClick);
-          }
-        }
+    return {
+      destroy() {
+        node.removeEventListener('click', onClick);
       }
     }
   }
 </script>
+
+<a href="#" use:link>Test</a>
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/input.html b/test/js/samples/collapses-text-around-comments/input.html
index 54c15b7922..a368b09ca4 100644
--- a/test/js/samples/collapses-text-around-comments/input.html
+++ b/test/js/samples/collapses-text-around-comments/input.html
@@ -1,3 +1,6 @@
+<script>
+	export let foo = 42;
+</script>
 
 <!-- a -->
 
@@ -17,13 +20,7 @@
 
 <!-- e -->
 
-<script>
-	export default {
-		data: function () {
-			return { foo: 42 }
-		}
-	};
-</script>
+
 
 <!-- f -->
 
diff --git a/test/js/samples/component-static-array/input.html b/test/js/samples/component-static-array/input.html
index f87ea0a7e5..3f4ecbe3c7 100644
--- a/test/js/samples/component-static-array/input.html
+++ b/test/js/samples/component-static-array/input.html
@@ -1,9 +1,5 @@
-<Nested foo={[1, 2, 3]}/>
-
 <script>
-	export default {
-		components: {
-			Nested: window.Nested
-		}
-	};
-</script>
\ No newline at end of file
+	const Nested = window.Nested;
+</script>
+
+<Nested foo={[1, 2, 3]}/>
\ No newline at end of file
diff --git a/test/js/samples/component-static-immutable/input.html b/test/js/samples/component-static-immutable/input.html
index df6c82ea81..d3c9d8066a 100644
--- a/test/js/samples/component-static-immutable/input.html
+++ b/test/js/samples/component-static-immutable/input.html
@@ -1,10 +1,7 @@
-<Nested foo='bar'/>
+<svelte:meta immutable/>
 
 <script>
-	export default {
-		immutable: true,
-		components: {
-			Nested: window.Nested
-		}
-	};
-</script>
\ No newline at end of file
+	const Nested = window.Nested;
+</script>
+
+<Nested foo='bar'/>
\ No newline at end of file
diff --git a/test/js/samples/component-static-immutable2/input.html b/test/js/samples/component-static-immutable2/input.html
index 44a2bf2bc1..0eeff6aeb6 100644
--- a/test/js/samples/component-static-immutable2/input.html
+++ b/test/js/samples/component-static-immutable2/input.html
@@ -1,9 +1,5 @@
-<Nested foo='bar'/>
-
 <script>
-	export default {
-		components: {
-			Nested: window.Nested
-		}
-	};
-</script>
\ No newline at end of file
+	const Nested = window.Nested;
+</script>
+
+<Nested foo='bar'/>
\ No newline at end of file
diff --git a/test/js/samples/component-static/input.html b/test/js/samples/component-static/input.html
index 44a2bf2bc1..0eeff6aeb6 100644
--- a/test/js/samples/component-static/input.html
+++ b/test/js/samples/component-static/input.html
@@ -1,9 +1,5 @@
-<Nested foo='bar'/>
-
 <script>
-	export default {
-		components: {
-			Nested: window.Nested
-		}
-	};
-</script>
\ No newline at end of file
+	const Nested = window.Nested;
+</script>
+
+<Nested foo='bar'/>
\ No newline at end of file
diff --git a/test/js/samples/computed-collapsed-if/input.html b/test/js/samples/computed-collapsed-if/input.html
index c7280e5ef8..c1349afc99 100644
--- a/test/js/samples/computed-collapsed-if/input.html
+++ b/test/js/samples/computed-collapsed-if/input.html
@@ -1,8 +1,11 @@
 <script>
-	export default {
-		computed: {
-			a: ({ x }) => x * 2,
-			b: ({ x }) => x * 3
-		}
-	};
+	export let x;
+
+	function a() {
+		return x * 2;
+	}
+
+	function b() {
+		return x * 3;
+	}
 </script>
\ No newline at end of file
diff --git a/test/js/samples/css-shadow-dom-keyframes/input.html b/test/js/samples/css-shadow-dom-keyframes/input.html
index fcdc7a9f0e..cc1274d7f9 100644
--- a/test/js/samples/css-shadow-dom-keyframes/input.html
+++ b/test/js/samples/css-shadow-dom-keyframes/input.html
@@ -1,3 +1,5 @@
+<svelte:meta tag="custom-element"/>
+
 <div>fades in</div>
 
 <style>
@@ -9,10 +11,4 @@
 		0% { opacity: 0; }
 		100% { opacity: 1; }
 	}
-</style>
-
-<script>
-	export default {
-		tag: 'custom-element'
-	};
-</script>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/test/js/samples/deconflict-globals/input.html b/test/js/samples/deconflict-globals/input.html
index 6c3dc88e87..b0760d27fe 100644
--- a/test/js/samples/deconflict-globals/input.html
+++ b/test/js/samples/deconflict-globals/input.html
@@ -1,11 +1,9 @@
 <script>
-	export default {
-		data: () => ({
-			foo: 'bar'
-		}),
+	import { onmount } from 'svelte';
 
-		oncreate() {
-			alert(JSON.stringify(data()));
-		}
-	};
+	export let foo = 'bar';
+
+	onmount(() => {
+		alert(JSON.stringify(data()));
+	});
 </script>
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/input.html b/test/js/samples/dev-warning-missing-data-computed/input.html
index 06eb210493..5d1e9836ea 100644
--- a/test/js/samples/dev-warning-missing-data-computed/input.html
+++ b/test/js/samples/dev-warning-missing-data-computed/input.html
@@ -1,12 +1,12 @@
+<script>
+	export let foo;
+
+	function bar() {
+		return foo * 2;
+	}
+</script>
+
 <p>
 	{Math.max(0, foo)}
-	{bar}
-</p>
-
-<script>
-	export default {
-		computed: {
-			bar: ({ foo }) => foo * 2
-		}
-	};
-</script>
\ No newline at end of file
+	{bar()}
+</p>
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/input.html b/test/js/samples/do-use-dataset/input.html
index fcd821731e..ffd72ac6ee 100644
--- a/test/js/samples/do-use-dataset/input.html
+++ b/test/js/samples/do-use-dataset/input.html
@@ -1,2 +1,2 @@
 <div data-foo='bar'/>
-<div data-foo='{bar}'/>
+<div data-foo='{bar}'/>
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-legacy/input.html b/test/js/samples/dont-use-dataset-in-legacy/input.html
index fcd821731e..ffd72ac6ee 100644
--- a/test/js/samples/dont-use-dataset-in-legacy/input.html
+++ b/test/js/samples/dont-use-dataset-in-legacy/input.html
@@ -1,2 +1,2 @@
 <div data-foo='bar'/>
-<div data-foo='{bar}'/>
+<div data-foo='{bar}'/>
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/input.html b/test/js/samples/dont-use-dataset-in-svg/input.html
index 3032322b80..fe6c4eba9b 100644
--- a/test/js/samples/dont-use-dataset-in-svg/input.html
+++ b/test/js/samples/dont-use-dataset-in-svg/input.html
@@ -1,4 +1,4 @@
 <svg>
 	<g data-foo='bar'/>
 	<g data-foo='{bar}'/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/test/js/samples/dynamic-import/input.html b/test/js/samples/dynamic-import/input.html
index cda0dbfbaf..eb7ca117c5 100644
--- a/test/js/samples/dynamic-import/input.html
+++ b/test/js/samples/dynamic-import/input.html
@@ -1,9 +1 @@
-<LazyLoad load="{() => import('./Foo.html')}"/>
-
-<script>
-	export default {
-		components: {
-			LazyLoad
-		}
-	};
-</script>
\ No newline at end of file
+<LazyLoad load="{() => import('./Foo.html')}"/>
\ No newline at end of file
diff --git a/test/js/samples/each-block-keyed-animated/input.html b/test/js/samples/each-block-keyed-animated/input.html
index 8c2e2f872b..53bcb463b1 100644
--- a/test/js/samples/each-block-keyed-animated/input.html
+++ b/test/js/samples/each-block-keyed-animated/input.html
@@ -1,23 +1,21 @@
-{#each things as thing (thing.id)}
-	<div animate:foo>{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		animations: {
-			foo(node, animation, params) {
-				const dx = animation.from.left - animation.to.left;
-				const dy = animation.from.top - animation.to.top;
+	export let things;
+
+	function foo(node, animation, params) {
+		const dx = animation.from.left - animation.to.left;
+		const dy = animation.from.top - animation.to.top;
 
-				return {
-					delay: params.delay,
-					duration: 100,
-					tick: (t, u) => {
-						node.dx = u * dx;
-						node.dy = u * dy;
-					}
-				};
+		return {
+			delay: params.delay,
+			duration: 100,
+			tick: (t, u) => {
+				node.dx = u * dx;
+				node.dy = u * dy;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing (thing.id)}
+	<div animate:foo>{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/js/samples/event-handlers-custom/input.html b/test/js/samples/event-handlers-custom/input.html
index 00d79363fa..d8cec97111 100644
--- a/test/js/samples/event-handlers-custom/input.html
+++ b/test/js/samples/event-handlers-custom/input.html
@@ -1,16 +1,13 @@
-<button on:foo='foo( bar )'>foo</button>
-
 <script>
-	export default {
-		methods: {
-			foo ( bar ) {
-				console.log( bar );
-			}
-		},
-		events: {
-			foo ( node, callback ) {
-				// code goes here
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	export let bar;
+
+	function handleFoo(bar) {
+		console.log( bar );
+	}
+
+	function foo(node, callback) {
+		// code goes here
+	}
+</script>
+
+<button on:foo='{() => handleFoo( bar )}'>foo</button>
\ No newline at end of file
diff --git a/test/js/samples/event-modifiers/input.html b/test/js/samples/event-modifiers/input.html
index 4726d96c70..5bbcebb72a 100644
--- a/test/js/samples/event-modifiers/input.html
+++ b/test/js/samples/event-modifiers/input.html
@@ -1,19 +1,15 @@
-<div on:touchstart="handleTouchstart()">
-	<button on:click|stopPropagation|preventDefault="handleClick()">click me</button>
-	<button on:click|once|capture="handleClick()">or me</button>
-	<button on:click|capture="handleClick()">or me!</button>
-</div>
-
 <script>
-	export default {
-		methods: {
-			handleTouchstart() {
-				// ...
-			},
+	function handleTouchstart() {
+		// ...
+	}
+
+	function handleClick() {
+		// ...
+	}
+</script>
 
-			handleClick() {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+<div on:touchstart="{handleTouchstart}">
+	<button on:click|stopPropagation|preventDefault="{handleClick}">click me</button>
+	<button on:click|once|capture="{handleClick}">or me</button>
+	<button on:click|capture="{handleClick}">or me!</button>
+</div>
\ No newline at end of file
diff --git a/test/js/samples/media-bindings/input.html b/test/js/samples/media-bindings/input.html
index e7fe359341..3f7a0b66d1 100644
--- a/test/js/samples/media-bindings/input.html
+++ b/test/js/samples/media-bindings/input.html
@@ -1 +1 @@
-<audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume/>
+<audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume/>
\ No newline at end of file
diff --git a/test/js/samples/non-imported-component/input.html b/test/js/samples/non-imported-component/input.html
index f65561020e..60bb515a3c 100644
--- a/test/js/samples/non-imported-component/input.html
+++ b/test/js/samples/non-imported-component/input.html
@@ -1,13 +1,6 @@
-<Imported/>
-<NonImported/>
-
 <script>
 	import Imported from 'Imported.html';
+</script>
 
-	export default {
-		components: {
-			Imported,
-			NonImported
-		}
-	};
-</script>
\ No newline at end of file
+<Imported/>
+<NonImported/>
\ No newline at end of file
diff --git a/test/js/samples/setup-method/input.html b/test/js/samples/setup-method/input.html
index 17a34221a3..1f48f2bc26 100644
--- a/test/js/samples/setup-method/input.html
+++ b/test/js/samples/setup-method/input.html
@@ -1,18 +1,9 @@
-<script>
-	export default {
-		methods: {
-			foo ( bar ) {
-				console.log( bar );
-			}
-		},
-		setup: (Component) => {
-			Component.SOME_CONSTANT = 42;
-			Component.factory = function (target) {
-				return new Component({
-					target: target
-				});
-			}
-			Component.prototype.foo( 'baz' );
-		}
-	};
+<script scope="shared">
+	export const SOME_CONSTANT = 42;
 </script>
+
+<script>
+	export function foo(bar) {
+		console.log( bar );
+	}
+</script>
\ No newline at end of file
diff --git a/test/js/samples/ssr-no-oncreate-etc/input.html b/test/js/samples/ssr-no-oncreate-etc/input.html
index a1e4fa7548..845c4797bd 100644
--- a/test/js/samples/ssr-no-oncreate-etc/input.html
+++ b/test/js/samples/ssr-no-oncreate-etc/input.html
@@ -1,27 +1,25 @@
+<script scope="shared">
+	export function preload(input) {
+		return output;
+	}
+</script>
+
 <script>
-	export default {
-		oncreate() {
-			console.log('oncreate');
-		},
+	import { ondestroy, onmount } from 'svelte';
 
-		ondestroy() {
-			console.log('ondestroy');
-		},
+	onmount(() => {
+		console.log('oncreate');
+	});
 
-		methods: {
-			foo() {
-				console.log('foo');
-			}
-		},
+	ondestroy(() => {
+		console.log('ondestroy');
+	});
 
-		events: {
-			swipe(node, callback) {
-				// TODO implement
-			}
-		},
+	function foo() {
+		console.log('foo');
+	}
 
-		preload(input) {
-			return output;
-		}
-	};
+	function swipe(node, callback) {
+		// TODO implement
+	}
 </script>
\ No newline at end of file
diff --git a/test/js/samples/ssr-preserve-comments/input.html b/test/js/samples/ssr-preserve-comments/input.html
index 7f7e291caa..c3b21de352 100644
--- a/test/js/samples/ssr-preserve-comments/input.html
+++ b/test/js/samples/ssr-preserve-comments/input.html
@@ -1,3 +1,3 @@
 <div>content</div>
 <!-- comment -->
-<div>more content</div>
+<div>more content</div>
\ No newline at end of file
diff --git a/test/runtime/samples/action-function/main.html b/test/runtime/samples/action-function/main.html
index cde902caad..4355739014 100644
--- a/test/runtime/samples/action-function/main.html
+++ b/test/runtime/samples/action-function/main.html
@@ -1,5 +1,3 @@
-<button use:tooltip="t(actionTransKey)">action</button>
-
 <script>
 	const translations = {
 		perform_action: 'Perform an Action'
@@ -9,38 +7,34 @@
 		return translations[key] || `{{${key}}}`;
 	}
 
-	export default {
-		data() {
-			return { t, actionTransKey: 'perform_action' };
-		},
+	export let actionTransKey = 'perform_action';
 
-		actions: {
-			tooltip(node, text) {
-				let tooltip = null;
+	function tooltip(node, text) {
+		let tooltip = null;
 
-				function onMouseEnter() {
-					tooltip = document.createElement('div');
-					tooltip.classList.add('tooltip');
-					tooltip.textContent = text;
-					node.parentNode.appendChild(tooltip);
-				}
+		function onMouseEnter() {
+			tooltip = document.createElement('div');
+			tooltip.classList.add('tooltip');
+			tooltip.textContent = text;
+			node.parentNode.appendChild(tooltip);
+		}
 
-				function onMouseLeave() {
-					if (!tooltip) return;
-					tooltip.remove();
-					tooltip = null;
-				}
+		function onMouseLeave() {
+			if (!tooltip) return;
+			tooltip.remove();
+			tooltip = null;
+		}
 
-				node.addEventListener('mouseenter', onMouseEnter);
-				node.addEventListener('mouseleave', onMouseLeave);
-				
-				return {
-					destroy() {
-						node.removeEventListener('mouseenter', onMouseEnter);
-						node.removeEventListener('mouseleave', onMouseLeave);
-					}
-				}
+		node.addEventListener('mouseenter', onMouseEnter);
+		node.addEventListener('mouseleave', onMouseLeave);
+		
+		return {
+			destroy() {
+				node.removeEventListener('mouseenter', onMouseEnter);
+				node.removeEventListener('mouseleave', onMouseLeave);
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<button use:tooltip="{t(actionTransKey)}">action</button>
\ No newline at end of file
diff --git a/test/runtime/samples/action-ternary-template/main.html b/test/runtime/samples/action-ternary-template/main.html
index 58e19e28f4..bec7e0a99b 100644
--- a/test/runtime/samples/action-ternary-template/main.html
+++ b/test/runtime/samples/action-ternary-template/main.html
@@ -1,21 +1,20 @@
-<h1 use:insert="display ? `Hello ${target}` : ''"></h1>
-
 <script>
-	export default {
-		actions: {
-			insert(node, text) {
+	export let display;
+	export let target;
+
+	function insert(node, text) {
 
-				function onClick() {
-					node.textContent = text;
-				}
-				node.addEventListener('click', onClick);
+		function onClick() {
+			node.textContent = text;
+		}
+		node.addEventListener('click', onClick);
 
-				return {
-					destroy() {
-						node.removeEventListener('click', onClick);
-					}
-				}
+		return {
+			destroy() {
+				node.removeEventListener('click', onClick);
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<h1 use:insert="{display ? `Hello ${target}` : ''}"></h1>
\ No newline at end of file
diff --git a/test/runtime/samples/action-this/main.html b/test/runtime/samples/action-this/main.html
index 6eb12e1206..130d797aca 100644
--- a/test/runtime/samples/action-this/main.html
+++ b/test/runtime/samples/action-this/main.html
@@ -1,22 +1,20 @@
-<button use:foo>{x}</button>
-
 <script>
-	export default {
-		actions: {
-			foo(node) {
-				let x = 0;
+	export let x;
+
+	function foo(node) {
+		let x = 0;
 
-				const handler = () => this.set({ x: x++ });
+		const handler = () => x = x++;
 
-				node.addEventListener('click', handler);
-				handler();
+		node.addEventListener('click', handler);
+		handler();
 
-				return {
-					destroy() {
-						node.removeEventListener('click', handler);
-					}
-				};
+		return {
+			destroy() {
+				node.removeEventListener('click', handler);
 			}
-		},
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<button use:foo>{x}</button>
\ No newline at end of file
diff --git a/test/runtime/samples/action-update/main.html b/test/runtime/samples/action-update/main.html
index 6b319f5dca..7b269f0414 100644
--- a/test/runtime/samples/action-update/main.html
+++ b/test/runtime/samples/action-update/main.html
@@ -1,52 +1,44 @@
-<button use:tooltip="tooltip">action</button>
-<svelte:window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
-
 <script>
-	export default {
-		data() {
-			return { tooltip: 'Perform an Action' };
-		},
+	export let tooltip = 'Perform an Action';
 
-		methods: {
-			checkForCtrl(event) {
-				if (event.ctrlKey) {
-					this.set({ tooltip: 'Perform an augmented Action' });
-				} else {
-					this.set({ tooltip: 'Perform an Action' });
-				}
-			}
-		},
+	function checkForCtrl(event) {
+		if (event.ctrlKey) {
+			tooltip = 'Perform an augmented Action';
+		} else {
+			tooltip = 'Perform an Action';
+		}
+	}
 
-		actions: {
-			tooltip(node, text) {
-				let tooltip = null;
+	function tooltip(node, text) {
+		let tooltip = null;
 
-				function onMouseEnter() {
-					tooltip = document.createElement('div');
-					tooltip.classList.add('tooltip');
-					tooltip.textContent = text;
-					node.parentNode.appendChild(tooltip);
-				}
+		function onMouseEnter() {
+			tooltip = document.createElement('div');
+			tooltip.classList.add('tooltip');
+			tooltip.textContent = text;
+			node.parentNode.appendChild(tooltip);
+		}
 
-				function onMouseLeave() {
-					if (!tooltip) return;
-					tooltip.remove();
-					tooltip = null;
-				}
+		function onMouseLeave() {
+			if (!tooltip) return;
+			tooltip.remove();
+			tooltip = null;
+		}
 
-				node.addEventListener('mouseenter', onMouseEnter);
-				node.addEventListener('mouseleave', onMouseLeave);
+		node.addEventListener('mouseenter', onMouseEnter);
+		node.addEventListener('mouseleave', onMouseLeave);
 
-				return {
-					update(text) {
-						if (tooltip) tooltip.textContent = text;
-					},
-					destroy() {
-						node.removeEventListener('mouseenter', onMouseEnter);
-						node.removeEventListener('mouseleave', onMouseLeave);
-					}
-				}
+		return {
+			update(text) {
+				if (tooltip) tooltip.textContent = text;
+			},
+			destroy() {
+				node.removeEventListener('mouseenter', onMouseEnter);
+				node.removeEventListener('mouseleave', onMouseLeave);
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<button use:tooltip="{tooltip}">action</button>
+<svelte:window on:keydown="{checkForCtrl}" on:keyup="{checkForCtrl}"/>
\ No newline at end of file
diff --git a/test/runtime/samples/action/main.html b/test/runtime/samples/action/main.html
index 505d0078b5..a6a7eb3610 100644
--- a/test/runtime/samples/action/main.html
+++ b/test/runtime/samples/action/main.html
@@ -1,34 +1,30 @@
-<button use:tooltip="'Perform an Action'">action</button>
-
 <script>
-	export default {
-		actions: {
-			tooltip(node, text) {
-				let tooltip = null;
+	function tooltip(node, text) {
+		let tooltip = null;
 
-				function onMouseEnter() {
-					tooltip = document.createElement('div');
-					tooltip.classList.add('tooltip');
-					tooltip.textContent = text;
-					node.parentNode.appendChild(tooltip);
-				}
+		function onMouseEnter() {
+			tooltip = document.createElement('div');
+			tooltip.classList.add('tooltip');
+			tooltip.textContent = text;
+			node.parentNode.appendChild(tooltip);
+		}
 
-				function onMouseLeave() {
-					if (!tooltip) return;
-					tooltip.remove();
-					tooltip = null;
-				}
+		function onMouseLeave() {
+			if (!tooltip) return;
+			tooltip.remove();
+			tooltip = null;
+		}
 
-				node.addEventListener('mouseenter', onMouseEnter);
-				node.addEventListener('mouseleave', onMouseLeave);
-				
-				return {
-					destroy() {
-						node.removeEventListener('mouseenter', onMouseEnter);
-						node.removeEventListener('mouseleave', onMouseLeave);
-					}
-				}
+		node.addEventListener('mouseenter', onMouseEnter);
+		node.addEventListener('mouseleave', onMouseLeave);
+		
+		return {
+			destroy() {
+				node.removeEventListener('mouseenter', onMouseEnter);
+				node.removeEventListener('mouseleave', onMouseLeave);
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<button use:tooltip="{'Perform an Action'}">action</button>
\ No newline at end of file
diff --git a/test/runtime/samples/animation-css/main.html b/test/runtime/samples/animation-css/main.html
index 1b4b015d1f..ec467d3eda 100644
--- a/test/runtime/samples/animation-css/main.html
+++ b/test/runtime/samples/animation-css/main.html
@@ -1,19 +1,17 @@
-{#each things as thing (thing.id)}
-	<div animate:flip>{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		animations: {
-			flip(node, animation, params) {
-				const dx = animation.from.left - animation.to.left;
-				const dy = animation.from.top - animation.to.top;
+	export let things;
+
+	function flip(node, animation, params) {
+		const dx = animation.from.left - animation.to.left;
+		const dy = animation.from.top - animation.to.top;
 
-				return {
-					duration: 100,
-					css: (t, u) => `transform: translate(${u + dx}px, ${u * dy}px)`
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+		return {
+			duration: 100,
+			css: (t, u) => `transform: translate(${u + dx}px, ${u * dy}px)`
+		};
+	}
+</script>
+
+{#each things as thing (thing.id)}
+	<div animate:flip>{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/animation-js-delay/main.html b/test/runtime/samples/animation-js-delay/main.html
index 5656f39700..a7fb2f1a85 100644
--- a/test/runtime/samples/animation-js-delay/main.html
+++ b/test/runtime/samples/animation-js-delay/main.html
@@ -1,23 +1,21 @@
-{#each things as thing, i (thing.id)}
-	<div animate:flip="{delay: i * 10}">{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		animations: {
-			flip(node, animation, params) {
-				const dx = animation.from.left - animation.to.left;
-				const dy = animation.from.top - animation.to.top;
+	export let things;
+
+	function flip(node, animation, params) {
+		const dx = animation.from.left - animation.to.left;
+		const dy = animation.from.top - animation.to.top;
 
-				return {
-					delay: params.delay,
-					duration: 100,
-					tick: (t, u) => {
-						node.dx = u * dx;
-						node.dy = u * dy;
-					}
-				};
+		return {
+			delay: params.delay,
+			duration: 100,
+			tick: (t, u) => {
+				node.dx = u * dx;
+				node.dy = u * dy;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing, i (thing.id)}
+	<div animate:flip="{delay: i * 10}">{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/animation-js/main.html b/test/runtime/samples/animation-js/main.html
index f39ecd7220..aef7fc920a 100644
--- a/test/runtime/samples/animation-js/main.html
+++ b/test/runtime/samples/animation-js/main.html
@@ -1,22 +1,20 @@
-{#each things as thing (thing.id)}
-	<div animate:flip>{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		animations: {
-			flip(node, animation, params) {
-				const dx = animation.from.left - animation.to.left;
-				const dy = animation.from.top - animation.to.top;
+	export let things;
+
+	function flip(node, animation, params) {
+		const dx = animation.from.left - animation.to.left;
+		const dy = animation.from.top - animation.to.top;
 
-				return {
-					duration: 100,
-					tick: (t, u) => {
-						node.dx = u * dx;
-						node.dy = u * dy;
-					}
-				};
+		return {
+			duration: 100,
+			tick: (t, u) => {
+				node.dx = u * dx;
+				node.dy = u * dy;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing (thing.id)}
+	<div animate:flip>{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-boolean-false/main.html b/test/runtime/samples/attribute-boolean-false/main.html
index ad3e510c72..fa8f64bd40 100644
--- a/test/runtime/samples/attribute-boolean-false/main.html
+++ b/test/runtime/samples/attribute-boolean-false/main.html
@@ -1 +1 @@
-<textarea readonly="{false}"></textarea>
+<textarea readonly="{false}"></textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-boolean-true/main.html b/test/runtime/samples/attribute-boolean-true/main.html
index fe4d7c4327..04d5cab8f9 100644
--- a/test/runtime/samples/attribute-boolean-true/main.html
+++ b/test/runtime/samples/attribute-boolean-true/main.html
@@ -1 +1 @@
-<textarea readonly="{true}"></textarea>
+<textarea readonly="{true}"></textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-casing/main.html b/test/runtime/samples/attribute-casing/main.html
index 3c2d5e18a0..bec13c0cca 100644
--- a/test/runtime/samples/attribute-casing/main.html
+++ b/test/runtime/samples/attribute-casing/main.html
@@ -6,4 +6,4 @@
 
 <svg viewBox='0 0 100 100' id='two'>
 	<text textLength=100>hellooooo</text>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-multiple/main.html b/test/runtime/samples/attribute-dynamic-multiple/main.html
index 45a17cdac1..4cf451668b 100644
--- a/test/runtime/samples/attribute-dynamic-multiple/main.html
+++ b/test/runtime/samples/attribute-dynamic-multiple/main.html
@@ -1,3 +1,3 @@
 {#each items as item, i}
 	<div class='{item.foo ? "foo" : ""} {item.bar ? "bar" : ""}'>{i + 1}</div>
-{/each}
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-no-dependencies/main.html b/test/runtime/samples/attribute-dynamic-no-dependencies/main.html
index 5d90c0ea58..73f8216c46 100644
--- a/test/runtime/samples/attribute-dynamic-no-dependencies/main.html
+++ b/test/runtime/samples/attribute-dynamic-no-dependencies/main.html
@@ -1 +1 @@
-<div><div title={'foo'}>bar</div></div>
+<div><div title={'foo'}>bar</div></div>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-quotemarks/main.html b/test/runtime/samples/attribute-dynamic-quotemarks/main.html
index a2e0495ea7..e628c35740 100644
--- a/test/runtime/samples/attribute-dynamic-quotemarks/main.html
+++ b/test/runtime/samples/attribute-dynamic-quotemarks/main.html
@@ -1 +1 @@
-<span title='{"\"foo\""}'>foo</span>
+<span title='{"\"foo\""}'>foo</span>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-reserved/main.html b/test/runtime/samples/attribute-dynamic-reserved/main.html
index 3909ae60b6..7d94f23eff 100644
--- a/test/runtime/samples/attribute-dynamic-reserved/main.html
+++ b/test/runtime/samples/attribute-dynamic-reserved/main.html
@@ -1,2 +1,2 @@
 <div class='{class}'></div>{123}
-<div class='{ class }'></div>{ 123 }
+<div class='{ class }'></div>{ 123 }
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-shorthand/main.html b/test/runtime/samples/attribute-dynamic-shorthand/main.html
index 9bbc477272..c5bdc9c35a 100644
--- a/test/runtime/samples/attribute-dynamic-shorthand/main.html
+++ b/test/runtime/samples/attribute-dynamic-shorthand/main.html
@@ -1,9 +1,5 @@
-<div {id}/>
-
 <script>
-	export default {
-		data: () => ({
-			id: 'foo'
-		})
-	};
+	export let id = 'foo';
 </script>
+
+<div {id}/>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic/main.html b/test/runtime/samples/attribute-dynamic/main.html
index 16865c6cef..180a7226df 100644
--- a/test/runtime/samples/attribute-dynamic/main.html
+++ b/test/runtime/samples/attribute-dynamic/main.html
@@ -1,9 +1,5 @@
-<div style='color: {color};'>{color}</div>
-
 <script>
-	export default {
-		data: () => ({
-			color: 'red'
-		})
-	};
+	export let color = 'red';
 </script>
+
+<div style='color: {color};'>{color}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-empty-svg/main.html b/test/runtime/samples/attribute-empty-svg/main.html
index d506782626..66df315b5c 100644
--- a/test/runtime/samples/attribute-empty-svg/main.html
+++ b/test/runtime/samples/attribute-empty-svg/main.html
@@ -1,3 +1,3 @@
 <svg>
 	<g class=''></g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-empty/main.html b/test/runtime/samples/attribute-empty/main.html
index 7c7b3d103a..63eb927eef 100644
--- a/test/runtime/samples/attribute-empty/main.html
+++ b/test/runtime/samples/attribute-empty/main.html
@@ -1 +1 @@
-<div class=''></div>
+<div class=''></div>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-partial-number/main.html b/test/runtime/samples/attribute-partial-number/main.html
index 3910cc093b..c720ea4eed 100644
--- a/test/runtime/samples/attribute-partial-number/main.html
+++ b/test/runtime/samples/attribute-partial-number/main.html
@@ -1,11 +1,5 @@
-<Component value="10px"/>
-
 <script>
 	import Component from './Component.html';
-
-	export default {
-		components: {
-			Component
-		}
-	};
 </script>
+
+<Component value="10px"/>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-prefer-expression/main.html b/test/runtime/samples/attribute-prefer-expression/main.html
index 111c9803c0..8c46350fa2 100644
--- a/test/runtime/samples/attribute-prefer-expression/main.html
+++ b/test/runtime/samples/attribute-prefer-expression/main.html
@@ -1,2 +1,2 @@
 <input type='radio' bind:group='foo' value='{false}'>
-<input type='radio' bind:group='foo' value='{true}'>
+<input type='radio' bind:group='foo' value='{true}'>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-static-boolean/main.html b/test/runtime/samples/attribute-static-boolean/main.html
index 3ca3bfd9a8..1536f3e1e8 100644
--- a/test/runtime/samples/attribute-static-boolean/main.html
+++ b/test/runtime/samples/attribute-static-boolean/main.html
@@ -1 +1 @@
-<textarea readonly></textarea>
+<textarea readonly></textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-static/main.html b/test/runtime/samples/attribute-static/main.html
index 3cb2e4b233..c6a8a8c95d 100644
--- a/test/runtime/samples/attribute-static/main.html
+++ b/test/runtime/samples/attribute-static/main.html
@@ -1 +1 @@
-<div class='foo'></div>
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/runtime/samples/await-component-oncreate/main.html b/test/runtime/samples/await-component-oncreate/main.html
index 8126271879..80a686962e 100644
--- a/test/runtime/samples/await-component-oncreate/main.html
+++ b/test/runtime/samples/await-component-oncreate/main.html
@@ -1,13 +1,9 @@
-{#await promise then value}
-	<Foo {value} />
-{/await}
-
 <script>
 	import Foo from './Foo.html';
 
-	export default {
-		components: {
-			Foo
-		}
-	};
-</script>
\ No newline at end of file
+	export let promise;
+</script>
+
+{#await promise then value}
+	<Foo {value} />
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-anchor/main.html b/test/runtime/samples/await-then-catch-anchor/main.html
index 94e6572be4..30a7589e3f 100644
--- a/test/runtime/samples/await-then-catch-anchor/main.html
+++ b/test/runtime/samples/await-then-catch-anchor/main.html
@@ -6,4 +6,4 @@
 {:catch theError}
 <p>oh no! {theError.message}</p>
 {/await}
-</div>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-event/main.html b/test/runtime/samples/await-then-catch-event/main.html
index 3b94adfd5a..5ddb2dde86 100644
--- a/test/runtime/samples/await-then-catch-event/main.html
+++ b/test/runtime/samples/await-then-catch-event/main.html
@@ -1,7 +1,7 @@
 {#await thePromise}
 	<p>loading...</p>
 {:then theValue}
-	<button ref:button on:click='set({ clicked: theValue })'>click me</button>
+	<button ref:button on:click='{() => clicked = theValue}'>click me</button>
 {:catch theError}
 	<p>oh no! {theError.message}</p>
 {/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-if/main.html b/test/runtime/samples/await-then-catch-if/main.html
index bdeb5a7f5e..f0d6243d31 100644
--- a/test/runtime/samples/await-then-catch-if/main.html
+++ b/test/runtime/samples/await-then-catch-if/main.html
@@ -8,4 +8,4 @@
 	{/await}
 {:else}
 	<p>Else</p>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-in-slot/main.html b/test/runtime/samples/await-then-catch-in-slot/main.html
index 327f91f804..ded116356c 100644
--- a/test/runtime/samples/await-then-catch-in-slot/main.html
+++ b/test/runtime/samples/await-then-catch-in-slot/main.html
@@ -1,3 +1,9 @@
+<script>
+	import Foo from './Foo.html';
+
+	export let thePromise;
+</script>
+
 <Foo>
 	{#await thePromise}
 		<p>loading...</p>
@@ -6,12 +12,4 @@
 	{:catch theError}
 		<p>oh no! {theError.message}</p>
 	{/await}
-</Foo>
-
-<script>
-	import Foo from './Foo.html';
-
-	export default {
-		components: { Foo }
-	};
-</script>
\ No newline at end of file
+</Foo>
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-no-values/main.html b/test/runtime/samples/await-then-catch-no-values/main.html
index 414b2fd068..f53591990a 100644
--- a/test/runtime/samples/await-then-catch-no-values/main.html
+++ b/test/runtime/samples/await-then-catch-no-values/main.html
@@ -4,4 +4,4 @@
 	resolved
 {:catch}
 	rejected
-{/await}
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-audio-currenttime-duration-volume/main.html b/test/runtime/samples/binding-audio-currenttime-duration-volume/main.html
index c65c0af8b7..1e32886de4 100644
--- a/test/runtime/samples/binding-audio-currenttime-duration-volume/main.html
+++ b/test/runtime/samples/binding-audio-currenttime-duration-volume/main.html
@@ -1,2 +1,2 @@
 <audio bind:currentTime='t' bind:duration='d' bind:paused bind:volume='v'
-	src='music.mp3'></audio>
+	src='music.mp3'></audio>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect-computed/main.html b/test/runtime/samples/binding-indirect-computed/main.html
index e41b5813c3..f21b71ed48 100644
--- a/test/runtime/samples/binding-indirect-computed/main.html
+++ b/test/runtime/samples/binding-indirect-computed/main.html
@@ -1,27 +1,22 @@
+<script>
+	export let letters = [
+		'a',
+		'b',
+		'c'
+	];
+	export let selected = {
+		letter: ''
+	};
+
+	function uppercase() {
+		return letters.map(x => x.toUpperCase());
+	}
+</script>
+
 <select bind:value="selected.letter">
 	{#each uppercase as letter}
 		<option value="{letter}">{letter}</option>
 	{/each}
 </select>
 
-{selected.letter}
-
-<script>
-	export default {
-		data() {
-			return {
-				letters: [
-					'a',
-					'b',
-					'c'
-				],
-				selected: {
-					letter: ''
-				}
-			}
-		},
-		computed:{
-			uppercase: ({ letters }) => letters.map(x => x.toUpperCase())
-		}
-	};
-</script>
\ No newline at end of file
+{selected.letter}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html b/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
index 209cdbeaf7..962531e1ba 100644
--- a/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
+++ b/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
@@ -1,15 +1,13 @@
+<script>
+	export let items;
+
+	function numCompleted() {
+		return items.reduce( ( total, item ) => total + ( item.completed ? 1 : 0 ), 0 );
+	}
+</script>
+
 {#each items as item}
 	<div><input type='checkbox' bind:checked='item.completed'><p>{item.description}</p></div>
 {/each}
 
-<p>{numCompleted} completed</p>
-
-<script>
-	export default {
-		computed: {
-			numCompleted ({ items }) {
-				return items.reduce( ( total, item ) => total + ( item.completed ? 1 : 0 ), 0 );
-			}
-		}
-	};
-</script>
+<p>{numCompleted()} completed</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox-indeterminate/main.html b/test/runtime/samples/binding-input-checkbox-indeterminate/main.html
index e515599dcc..282d9f22e3 100644
--- a/test/runtime/samples/binding-input-checkbox-indeterminate/main.html
+++ b/test/runtime/samples/binding-input-checkbox-indeterminate/main.html
@@ -1,3 +1,3 @@
 <input type='checkbox' bind:checked bind:indeterminate>
 <p>checked? {checked}</p>
-<p>indeterminate? {indeterminate}</p>
+<p>indeterminate? {indeterminate}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox-with-event-in-each/main.html b/test/runtime/samples/binding-input-checkbox-with-event-in-each/main.html
index e555f4c4b6..e450704947 100644
--- a/test/runtime/samples/binding-input-checkbox-with-event-in-each/main.html
+++ b/test/runtime/samples/binding-input-checkbox-with-event-in-each/main.html
@@ -1,14 +1,11 @@
-{#each cats as cat (cat.name)}
-	<input type="checkbox" bind:checked="cat.checked" on:change="someCheck()">
-{/each}
-
 <script>
-	export default {
-		oncreate() {},
-		methods: {
-			someCheck() {
-				console.log('Check');
-			}
-		},
-	};
-</script>
\ No newline at end of file
+	export let cats;
+
+	function someCheck() {
+		console.log('Check');
+	}
+</script>
+
+{#each cats as cat (cat.name)}
+	<input type="checkbox" bind:checked="cat.checked" on:change="{someCheck}">
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox/main.html b/test/runtime/samples/binding-input-checkbox/main.html
index 47562d6adc..2a5c3bbf8c 100644
--- a/test/runtime/samples/binding-input-checkbox/main.html
+++ b/test/runtime/samples/binding-input-checkbox/main.html
@@ -1,2 +1,2 @@
 <input type='checkbox' bind:checked='foo'>
-<p>{foo}</p>
+<p>{foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-number/main.html b/test/runtime/samples/binding-input-number/main.html
index 2a581dc675..b10a7107bd 100644
--- a/test/runtime/samples/binding-input-number/main.html
+++ b/test/runtime/samples/binding-input-number/main.html
@@ -1,2 +1,2 @@
 <input type='number' bind:value='count'>
-<p>{typeof count} {count}</p>
+<p>{typeof count} {count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-range-change/main.html b/test/runtime/samples/binding-input-range-change/main.html
index 0fbddb74aa..afa2446da1 100644
--- a/test/runtime/samples/binding-input-range-change/main.html
+++ b/test/runtime/samples/binding-input-range-change/main.html
@@ -1,2 +1,2 @@
 <input type='range' bind:value='count'>
-<p>{typeof count} {count}</p>
+<p>{typeof count} {count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-range/main.html b/test/runtime/samples/binding-input-range/main.html
index 0fbddb74aa..afa2446da1 100644
--- a/test/runtime/samples/binding-input-range/main.html
+++ b/test/runtime/samples/binding-input-range/main.html
@@ -1,2 +1,2 @@
 <input type='range' bind:value='count'>
-<p>{typeof count} {count}</p>
+<p>{typeof count} {count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-contextual/main.html b/test/runtime/samples/binding-input-text-contextual/main.html
index 7b3f35244f..085be21813 100644
--- a/test/runtime/samples/binding-input-text-contextual/main.html
+++ b/test/runtime/samples/binding-input-text-contextual/main.html
@@ -1,3 +1,3 @@
 {#each items as item}
 	<div><input bind:value='item'><p>{item}</p></div>
-{/each}
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-computed/main.html b/test/runtime/samples/binding-input-text-deep-computed/main.html
index 55ad4b53fa..aa17d91989 100644
--- a/test/runtime/samples/binding-input-text-deep-computed/main.html
+++ b/test/runtime/samples/binding-input-text-deep-computed/main.html
@@ -1,2 +1,2 @@
 <input bind:value='user[prop]'>
-<p>hello {user.name}</p>
+<p>hello {user.name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-contextual/main.html b/test/runtime/samples/binding-input-text-deep-contextual/main.html
index 7d21a2ddb2..8f0798de43 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual/main.html
+++ b/test/runtime/samples/binding-input-text-deep-contextual/main.html
@@ -1,3 +1,3 @@
 {#each items as item}
 	<div><input bind:value='item.description'><p>{item.description}</p></div>
-{/each}
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep/main.html b/test/runtime/samples/binding-input-text-deep/main.html
index f7f7d4dbc0..17384df29d 100644
--- a/test/runtime/samples/binding-input-text-deep/main.html
+++ b/test/runtime/samples/binding-input-text-deep/main.html
@@ -1,2 +1,2 @@
 <input bind:value='user.name'>
-<p>hello {user.name}</p>
+<p>hello {user.name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text/main.html b/test/runtime/samples/binding-input-text/main.html
index 143c9054b1..d89284cb89 100644
--- a/test/runtime/samples/binding-input-text/main.html
+++ b/test/runtime/samples/binding-input-text/main.html
@@ -1,2 +1,2 @@
 <input bind:value='name'>
-<p>hello {name}</p>
+<p>hello {name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-with-event/main.html b/test/runtime/samples/binding-input-with-event/main.html
index 8227cfd6e0..fd294c5029 100644
--- a/test/runtime/samples/binding-input-with-event/main.html
+++ b/test/runtime/samples/binding-input-with-event/main.html
@@ -1 +1 @@
-<input bind:value='a' on:input='set({ b: 0 })'>
\ No newline at end of file
+<input bind:value='a' on:input='{() => b = 0}'>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-in-yield/Modal.html b/test/runtime/samples/binding-select-in-yield/Modal.html
index ceeece2ddd..60a4d0b994 100644
--- a/test/runtime/samples/binding-select-in-yield/Modal.html
+++ b/test/runtime/samples/binding-select-in-yield/Modal.html
@@ -1,20 +1,11 @@
+<script>
+	export let hidden = true;
+
+	export function toggle() {
+		hidden = !this.get().hidden;
+	}
+</script>
+
 {#if !hidden}
 	<slot></slot>
-{/if}
-
-<script>
-	export default {
-		data () {
-			return {
-				hidden: true
-			};
-		},
-		methods: {
-			toggle () {
-				this.set({
-					hidden: !this.get().hidden
-				});
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-in-yield/main.html b/test/runtime/samples/binding-select-in-yield/main.html
index 3dd21cdc7b..24dd3d47e7 100644
--- a/test/runtime/samples/binding-select-in-yield/main.html
+++ b/test/runtime/samples/binding-select-in-yield/main.html
@@ -1,3 +1,10 @@
+<script>
+	import Modal from './Modal.html';
+
+	export let letter;
+	export let letters = ['a', 'b', 'c'];
+</script>
+
 <Modal ref:modal>
 	<span>{letter}</span>
 	<select bind:value='letter'>
@@ -5,19 +12,4 @@
 			<option value="{letter}">{letter}</option>
 		{/each}
 	</select>
-</Modal>
-
-<script>
-	import Modal from './Modal.html';
-
-	export default {
-		data () {
-			return {
-				letters: ['a', 'b', 'c']
-			};
-		},
-		components: {
-			Modal
-		}
-	};
-</script>
\ No newline at end of file
+</Modal>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-late/main.html b/test/runtime/samples/binding-select-late/main.html
index 2cbbff8b4a..83a9381a3d 100644
--- a/test/runtime/samples/binding-select-late/main.html
+++ b/test/runtime/samples/binding-select-late/main.html
@@ -4,4 +4,4 @@
 	{/each}
 </select>
 
-<p>selected: {selected || 'nothing'}</p>
+<p>selected: {selected || 'nothing'}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-multiple/main.html b/test/runtime/samples/binding-select-multiple/main.html
index c4d33dc2c0..4fcc4de029 100644
--- a/test/runtime/samples/binding-select-multiple/main.html
+++ b/test/runtime/samples/binding-select-multiple/main.html
@@ -4,4 +4,4 @@
 	<option>three</option>
 </select>
 
-<p>selected: {selected.join( ', ' )}</p>
+<p>selected: {selected.join( ', ' )}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select/main.html b/test/runtime/samples/binding-select/main.html
index 84795bfa86..690c2b3624 100644
--- a/test/runtime/samples/binding-select/main.html
+++ b/test/runtime/samples/binding-select/main.html
@@ -6,4 +6,4 @@
 	<option>three</option>
 </select>
 
-<p>selected: {selected}</p>
+<p>selected: {selected}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-textarea/main.html b/test/runtime/samples/binding-textarea/main.html
index 1f3f0caebd..5d4177bf92 100644
--- a/test/runtime/samples/binding-textarea/main.html
+++ b/test/runtime/samples/binding-textarea/main.html
@@ -1,2 +1,2 @@
 <textarea bind:value></textarea>
-<p>{value}</p>
+<p>{value}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/bindings-before-oncreate/One.html b/test/runtime/samples/bindings-before-oncreate/One.html
index 905dd23def..54c771e32f 100644
--- a/test/runtime/samples/bindings-before-oncreate/One.html
+++ b/test/runtime/samples/bindings-before-oncreate/One.html
@@ -1,15 +1,13 @@
-<Two bind:foo/>
-
 <script>
+	import { onmount } from 'svelte';
 	import Two from './Two.html';
 
-	export default {
-		components: {
-			Two
-		},
+	export let snapshot;
+	export let foo;
+
+	onmount(() => {
+		snapshot = foo;
+	});
+</script>
 
-		oncreate() {
-			this.snapshot = this.get().foo;
-		}
-	};
-</script>
\ No newline at end of file
+<Two bind:foo/>
\ No newline at end of file
diff --git a/test/runtime/samples/bindings-before-oncreate/Two.html b/test/runtime/samples/bindings-before-oncreate/Two.html
index a1143a68f1..30889be9c5 100644
--- a/test/runtime/samples/bindings-before-oncreate/Two.html
+++ b/test/runtime/samples/bindings-before-oncreate/Two.html
@@ -1,15 +1,7 @@
 <script>
-	export default {
-		data() {
-			return {
-				bar: 1
-			};
-		},
+	export let bar = 1;
 
-		computed: {
-			foo({ bar }) {
-				return bar * 2;
-			}
-		}
-	};
+	function foo() {
+		return bar * 2;
+	}
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/bindings-before-oncreate/main.html b/test/runtime/samples/bindings-before-oncreate/main.html
index 02746ecc51..6d40cec2dc 100644
--- a/test/runtime/samples/bindings-before-oncreate/main.html
+++ b/test/runtime/samples/bindings-before-oncreate/main.html
@@ -1,9 +1,5 @@
-<One ref:one/>
-
 <script>
 	import One from './One.html';
+</script>
 
-	export default {
-		components: { One }
-	};
-</script>
\ No newline at end of file
+<One ref:one/>
\ No newline at end of file
diff --git a/test/runtime/samples/bindings-coalesced/Foo.html b/test/runtime/samples/bindings-coalesced/Foo.html
index 3b6b796ccb..7be8cc4f94 100644
--- a/test/runtime/samples/bindings-coalesced/Foo.html
+++ b/test/runtime/samples/bindings-coalesced/Foo.html
@@ -1,20 +1,12 @@
-<p>bar in Foo: {bar}</p>
-<p>baz in Foo: {baz}</p>
-
 <script>
-	export default {
-		data() {
-			return {
-				bar: 1,
-				baz: 2
-			};
-		},
+	export let bar = 1;
+	export let baz = 2;
 
-		methods: {
-			double() {
-				const { bar, baz } = this.get();
-				this.set({ bar: bar * 2, baz: baz * 2 });
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	export function double() {
+		bar = bar * 2;
+		baz = baz * 2;
+	}
+</script>
+
+<p>bar in Foo: {bar}</p>
+<p>baz in Foo: {baz}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/bindings-coalesced/main.html b/test/runtime/samples/bindings-coalesced/main.html
index c98ae0f8df..53263ed968 100644
--- a/test/runtime/samples/bindings-coalesced/main.html
+++ b/test/runtime/samples/bindings-coalesced/main.html
@@ -1,12 +1,9 @@
-<Foo ref:foo bind:bar bind:baz/>
-<p ref:p>{bar + baz}</p>
-
 <script>
 	import Foo from './Foo.html';
 
-	export default {
-		components: {
-			Foo
-		}
-	};
-</script>
\ No newline at end of file
+	export let bar;
+	export let baz;
+</script>
+
+<Foo ref:foo bind:bar bind:baz/>
+<p ref:p>{bar + baz}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/class-boolean/main.html b/test/runtime/samples/class-boolean/main.html
index 2595907a6e..31df46dfe5 100644
--- a/test/runtime/samples/class-boolean/main.html
+++ b/test/runtime/samples/class-boolean/main.html
@@ -1 +1 @@
-<div class:one="true"></div>
+<div class:one="true"></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-helper/main.html b/test/runtime/samples/class-helper/main.html
index 8e77da1282..6aecd57f6f 100644
--- a/test/runtime/samples/class-helper/main.html
+++ b/test/runtime/samples/class-helper/main.html
@@ -1,11 +1,9 @@
-<div class:active="isActive(user)"></div>
-
 <script>
-export default {
-  helpers: {
-    isActive(user) {
-      return user.active;
-    }
-  }
+  export let user;
+
+  function isActive(user) {
+  return user.active;
 }
 </script>
+
+<div class:active="isActive(user)"></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-in-each/main.html b/test/runtime/samples/class-in-each/main.html
index 7b822fa313..ac61ce0fd9 100644
--- a/test/runtime/samples/class-in-each/main.html
+++ b/test/runtime/samples/class-in-each/main.html
@@ -1,3 +1,3 @@
 {#each things as thing}
 	<div class:selected="selected === thing"></div>
-{/each}
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/class-shortcut-with-class/main.html b/test/runtime/samples/class-shortcut-with-class/main.html
index 8e608c33e7..0ef207e946 100644
--- a/test/runtime/samples/class-shortcut-with-class/main.html
+++ b/test/runtime/samples/class-shortcut-with-class/main.html
@@ -1 +1 @@
-<div class="{ myClass }" class:is-active class:isSelected class:not-used></div>
+<div class="{ myClass }" class:is-active class:isSelected class:not-used></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-shortcut/main.html b/test/runtime/samples/class-shortcut/main.html
index 2bd6a32b6e..7c9affa0b5 100644
--- a/test/runtime/samples/class-shortcut/main.html
+++ b/test/runtime/samples/class-shortcut/main.html
@@ -1 +1 @@
-<div class:is-active class:isSelected class:not-used></div>
+<div class:is-active class:isSelected class:not-used></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-with-attribute/main.html b/test/runtime/samples/class-with-attribute/main.html
index c8d9e98f76..5bf57892e9 100644
--- a/test/runtime/samples/class-with-attribute/main.html
+++ b/test/runtime/samples/class-with-attribute/main.html
@@ -1 +1 @@
-<div class="one" class:two="true" class:three="true"></div>
+<div class="one" class:two="true" class:three="true"></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-with-dynamic-attribute/main.html b/test/runtime/samples/class-with-dynamic-attribute/main.html
index b329f1544d..40c293f5d5 100644
--- a/test/runtime/samples/class-with-dynamic-attribute/main.html
+++ b/test/runtime/samples/class-with-dynamic-attribute/main.html
@@ -1 +1 @@
-<div class="{ myClass }" class:three="true"></div>
+<div class="{ myClass }" class:three="true"></div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-b/Nested.html b/test/runtime/samples/component-binding-blowback-b/Nested.html
index 7a55118ec0..58c689ce7f 100644
--- a/test/runtime/samples/component-binding-blowback-b/Nested.html
+++ b/test/runtime/samples/component-binding-blowback-b/Nested.html
@@ -1,8 +1,8 @@
-<li>
-	<slot></slot>
-</li>
-
 <script>
+	import { onmount } from 'svelte';
+
+	let id;
+
 	const initialValues = {
 		'id-0': 'zero',
 		'id-1': 'one',
@@ -10,9 +10,11 @@
 		'id-3': 'three'
 	};
 
-	export default {
-		oncreate() {
-			this.set({ value: initialValues[this.get().id] });
-		}
-	};
+	onmount(() => {
+		value = initialValues[id];
+	});
 </script>
+
+<li>
+	<slot></slot>
+</li>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-b/main.html b/test/runtime/samples/component-binding-blowback-b/main.html
index 301f5b7da8..892686bc8d 100644
--- a/test/runtime/samples/component-binding-blowback-b/main.html
+++ b/test/runtime/samples/component-binding-blowback-b/main.html
@@ -1,3 +1,16 @@
+<script>
+	import Nested from './Nested.html';
+	
+	export let count;
+	export let idToValue = Object.create(null);
+
+	function ids() {
+		return new Array(count)
+			.fill(null)
+			.map((_, i) => 'id-' + i);
+	}
+</script>
+
 <input type='number' bind:value='count'>
 
 <ol>
@@ -6,28 +19,4 @@
 			{id}: value is {idToValue[id]}
 		</Nested>
 	{/each}
-</ol>
-
-<script>
-	import Nested from './Nested.html';
-	
-	export default {
-		data() {
-			return {
-				idToValue: Object.create(null)
-			};
-		},
-
-		computed: {
-			ids({ count }) {
-				return new Array(count)
-					.fill(null)
-					.map((_, i) => 'id-' + i);
-			}
-		},
-
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+</ol>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-c/Nested.html b/test/runtime/samples/component-binding-blowback-c/Nested.html
index 7a55118ec0..901d5f3a67 100644
--- a/test/runtime/samples/component-binding-blowback-c/Nested.html
+++ b/test/runtime/samples/component-binding-blowback-c/Nested.html
@@ -1,8 +1,8 @@
-<li>
-	<slot></slot>
-</li>
-
 <script>
+	import { onmount } from 'svelte';
+
+	export let id;
+
 	const initialValues = {
 		'id-0': 'zero',
 		'id-1': 'one',
@@ -10,9 +10,11 @@
 		'id-3': 'three'
 	};
 
-	export default {
-		oncreate() {
-			this.set({ value: initialValues[this.get().id] });
-		}
-	};
+	onmount(() => {
+		value = initialValues[id];
+	});
 </script>
+
+<li>
+	<slot></slot>
+</li>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-c/main.html b/test/runtime/samples/component-binding-blowback-c/main.html
index 21d69d3c40..111b6dc108 100644
--- a/test/runtime/samples/component-binding-blowback-c/main.html
+++ b/test/runtime/samples/component-binding-blowback-c/main.html
@@ -1,3 +1,17 @@
+<script>
+	import Nested from './Nested.html';
+
+	export let count;
+	export let idToValue = Object.create(null);
+
+	function ids() {
+		return new Array(count)
+			.fill(null)
+			.map((_, i) => ({ id: 'id-' + i}))
+			.reverse();
+	}
+</script>
+
 <input type='number' bind:value='count'>
 
 <ol>
@@ -6,29 +20,4 @@
 			{object.id}: value is {idToValue[object.id]}
 		</Nested>
 	{/each}
-</ol>
-
-<script>
-	import Nested from './Nested.html';
-
-	export default {
-		data() {
-			return {
-				idToValue: Object.create(null)
-			};
-		},
-
-		computed: {
-			ids({ count }) {
-				return new Array(count)
-					.fill(null)
-					.map((_, i) => ({ id: 'id-' + i}))
-					.reverse();
-			}
-		},
-
-		components: {
-			Nested
-		}
-	};
-</script>
+</ol>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback/main.html b/test/runtime/samples/component-binding-blowback/main.html
index edb9b0e8b0..1a5f8af756 100644
--- a/test/runtime/samples/component-binding-blowback/main.html
+++ b/test/runtime/samples/component-binding-blowback/main.html
@@ -1,22 +1,12 @@
-{#if x}
-	<Widget bind:foo='bar.baz'/>
-{/if}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data: function () {
-			return {
-				x: false,
-				bar: {
-					baz: 42
-				}
-			};
-		},
-
-		components: {
-			Widget
-		}
+	export let x = false;
+	export let bar = {
+		baz: 42
 	};
 </script>
+
+{#if x}
+	<Widget bind:foo='bar.baz'/>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-computed/main.html b/test/runtime/samples/component-binding-computed/main.html
index af6283b5bf..b795d99382 100644
--- a/test/runtime/samples/component-binding-computed/main.html
+++ b/test/runtime/samples/component-binding-computed/main.html
@@ -1,22 +1,13 @@
-{#each fields as field}
-	<Nested {field} bind:value='values[field]'/>
-{/each}
-
 <script>
 	import Nested from './Nested.html';
 
-	export default {
-		data: function () {
-			return {
-				fields: ['firstname', 'lastname'],
-				values: {
-					firstname: '',
-					lastname: ''
-				}
-			};
-		},
-		components: {
-			Nested
-		}
+	export let fields = ['firstname', 'lastname'];
+	export let values = {
+		firstname: '',
+		lastname: ''
 	};
-</script>
\ No newline at end of file
+</script>
+
+{#each fields as field}
+	<Nested {field} bind:value='values[field]'/>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional-b/Bar.html b/test/runtime/samples/component-binding-conditional-b/Bar.html
index 17bd4cfe70..a2357b74b5 100644
--- a/test/runtime/samples/component-binding-conditional-b/Bar.html
+++ b/test/runtime/samples/component-binding-conditional-b/Bar.html
@@ -1,9 +1,5 @@
-<p>y: {y}</p>
-
 <script>
-	export default {
-		data: () => ({
-			y: 'bar'
-		})
-	};
+	export let y = 'bar';
 </script>
+
+<p>y: {y}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional-b/Baz.html b/test/runtime/samples/component-binding-conditional-b/Baz.html
index 836ecc80ce..569f764754 100644
--- a/test/runtime/samples/component-binding-conditional-b/Baz.html
+++ b/test/runtime/samples/component-binding-conditional-b/Baz.html
@@ -1,7 +1,3 @@
 <script>
-	export default {
-		data: () => ({
-			x: true
-		})
-	};
-</script>
+	export let x = true;
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional-b/Foo.html b/test/runtime/samples/component-binding-conditional-b/Foo.html
index 6365b7433e..12835d6049 100644
--- a/test/runtime/samples/component-binding-conditional-b/Foo.html
+++ b/test/runtime/samples/component-binding-conditional-b/Foo.html
@@ -1,9 +1,5 @@
-<p>y: {y}</p>
-
 <script>
-	export default {
-		data: () => ({
-			y: 'foo'
-		})
-	};
+	export let y = 'foo';
 </script>
+
+<p>y: {y}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional-b/main.html b/test/runtime/samples/component-binding-conditional-b/main.html
index d72129b100..a96c8b671d 100644
--- a/test/runtime/samples/component-binding-conditional-b/main.html
+++ b/test/runtime/samples/component-binding-conditional-b/main.html
@@ -1,3 +1,12 @@
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+	import Baz from './Baz.html';
+
+	export let y;
+	export let x;
+</script>
+
 <p>y: {y}</p>
 
 <Baz bind:x/>
@@ -6,18 +15,4 @@
 	<Foo bind:y/>
 {:else}
 	<Bar bind:y/>
-{/if}
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-	import Baz from './Baz.html';
-
-	export default {
-		components: {
-			Foo,
-			Bar,
-			Baz
-		}
-	};
-</script>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional/Bar.html b/test/runtime/samples/component-binding-conditional/Bar.html
index 17bd4cfe70..a2357b74b5 100644
--- a/test/runtime/samples/component-binding-conditional/Bar.html
+++ b/test/runtime/samples/component-binding-conditional/Bar.html
@@ -1,9 +1,5 @@
-<p>y: {y}</p>
-
 <script>
-	export default {
-		data: () => ({
-			y: 'bar'
-		})
-	};
+	export let y = 'bar';
 </script>
+
+<p>y: {y}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional/Baz.html b/test/runtime/samples/component-binding-conditional/Baz.html
index 836ecc80ce..569f764754 100644
--- a/test/runtime/samples/component-binding-conditional/Baz.html
+++ b/test/runtime/samples/component-binding-conditional/Baz.html
@@ -1,7 +1,3 @@
 <script>
-	export default {
-		data: () => ({
-			x: true
-		})
-	};
-</script>
+	export let x = true;
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional/Foo.html b/test/runtime/samples/component-binding-conditional/Foo.html
index 6365b7433e..12835d6049 100644
--- a/test/runtime/samples/component-binding-conditional/Foo.html
+++ b/test/runtime/samples/component-binding-conditional/Foo.html
@@ -1,9 +1,5 @@
-<p>y: {y}</p>
-
 <script>
-	export default {
-		data: () => ({
-			y: 'foo'
-		})
-	};
+	export let y = 'foo';
 </script>
+
+<p>y: {y}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-conditional/main.html b/test/runtime/samples/component-binding-conditional/main.html
index b5ccdcb154..9316eb5866 100644
--- a/test/runtime/samples/component-binding-conditional/main.html
+++ b/test/runtime/samples/component-binding-conditional/main.html
@@ -1,3 +1,12 @@
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+	import Baz from './Baz.html';
+
+	export let y;
+	export let x;
+</script>
+
 <p>y: {y}</p>
 
 {#if x}
@@ -6,18 +15,4 @@
 	<Bar bind:y/>
 {/if}
 
-<Baz bind:x/>
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-	import Baz from './Baz.html';
-
-	export default {
-		components: {
-			Foo,
-			Bar,
-			Baz
-		}
-	};
-</script>
+<Baz bind:x/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-deep-b/main.html b/test/runtime/samples/component-binding-deep-b/main.html
index a0914788f3..32c50b5769 100644
--- a/test/runtime/samples/component-binding-deep-b/main.html
+++ b/test/runtime/samples/component-binding-deep-b/main.html
@@ -1,44 +1,37 @@
-<ComponentSelector {components} bind:selectedComponent/>
-<Editor bind:code='selectedComponent.source' />
-
-<pre>
-{compiled}
-</pre>
-
 <script>
+	import { onprops } from 'svelte';
+
 	import Editor from './Editor.html';
 	import ComponentSelector from './ComponentSelector.html';
 
-	export default {
-		components: {
-			ComponentSelector,
-			Editor
-		},
-
-		onstate({ changed, current }) {
-			const { selectedComponent } = this.get();
+	export let components;
+	export let selectedComponent;
+	export let compiled;
 
-			if (changed.components) {
-				components.forEach(component => {
-					if (component === selectedComponent) return;
-					component.compiled = component.source.toUpperCase();
-				});
-			}
+	let previouslySelectedComponent;
 
-			if (changed.selectedComponent) {
-				selectedComponent.compiled = selectedComponent.source.toUpperCase();
-				this.updateBundle();
-			}
-		},
+	onprops(() => {
+		components.forEach(component => {
+			if (component === selectedComponent) return;
+			component.compiled = component.source.toUpperCase();
+		});
 
-		methods: {
-			updateBundle() {
-				const components = this.get('components');
+		if (selectedComponent !== previouslySelectedComponent) {
+			selectedComponent.compiled = selectedComponent.source.toUpperCase();
+			updateBundle();
 
-				const compiled = components.map(component => component.compiled).join('\n');
-
-				this.set({ compiled });
-			}
+			previouslySelectedComponent = selectedComponent;
 		}
+	});
+
+	function updateBundle() {
+		compiled = components.map(component => component.compiled).join('\n');
 	}
-</script>
\ No newline at end of file
+</script>
+
+<ComponentSelector {components} bind:selectedComponent/>
+<Editor bind:code='selectedComponent.source' />
+
+<pre>
+{compiled}
+</pre>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-deep/main.html b/test/runtime/samples/component-binding-deep/main.html
index 377b488a5f..6ffb9fa0ba 100644
--- a/test/runtime/samples/component-binding-deep/main.html
+++ b/test/runtime/samples/component-binding-deep/main.html
@@ -1,21 +1,11 @@
-<Widget bind:value='deep.name'/>
-
-<p>{deep.name}</p>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data () {
-			return {
-				deep: {
-					name: 'foo'
-				}
-			};
-		},
-
-		components: {
-			Widget
-		}
+	export let deep = {
+		name: 'foo'
 	};
 </script>
+
+<Widget bind:value='deep.name'/>
+
+<p>{deep.name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-nested/main.html b/test/runtime/samples/component-binding-each-nested/main.html
index 18a910a6c5..80d368c1bb 100644
--- a/test/runtime/samples/component-binding-each-nested/main.html
+++ b/test/runtime/samples/component-binding-each-nested/main.html
@@ -1,22 +1,12 @@
-{#each a as x}
-	<Widget bind:value='x.name'/>
-{/each}
-
-<p>{a.map(getName).join(', ')}</p>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data () {
-			return {
-				a: [{ name: 'foo' }, { name: 'bar' }, { name: 'baz' }],
-				getName: x => x.name
-			};
-		},
-
-		components: {
-			Widget
-		}
-	};
+	export let a = [{ name: 'foo' }, { name: 'bar' }, { name: 'baz' }];
+	export let getName = x => x.name;
 </script>
+
+{#each a as x}
+	<Widget bind:value='x.name'/>
+{/each}
+
+<p>{a.map(getName).join(', ')}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-object/main.html b/test/runtime/samples/component-binding-each-object/main.html
index f0952436b6..913ad554f7 100644
--- a/test/runtime/samples/component-binding-each-object/main.html
+++ b/test/runtime/samples/component-binding-each-object/main.html
@@ -1,13 +1,9 @@
-{#each a as x}
-	<Widget bind:value='x'/>
-{/each}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: {
-			Widget
-		}
-	};
+	export let a;
 </script>
+
+{#each a as x}
+	<Widget bind:value='x'/>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each/main.html b/test/runtime/samples/component-binding-each/main.html
index c26dfef743..42fcbd658d 100644
--- a/test/runtime/samples/component-binding-each/main.html
+++ b/test/runtime/samples/component-binding-each/main.html
@@ -1,21 +1,11 @@
-{#each a as x}
-	<Widget bind:value='x'/>
-{/each}
-
-<p>{a.join(', ')}</p>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data () {
-			return {
-				a: [ 'foo', 'bar', 'baz' ]
-			};
-		},
-
-		components: {
-			Widget
-		}
-	};
+	export let a = [ 'foo', 'bar', 'baz' ];
 </script>
+
+{#each a as x}
+	<Widget bind:value='x'/>
+{/each}
+
+<p>{a.join(', ')}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-infinite-loop/A.html b/test/runtime/samples/component-binding-infinite-loop/A.html
index d625b3d6a9..d4a9bf8eac 100644
--- a/test/runtime/samples/component-binding-infinite-loop/A.html
+++ b/test/runtime/samples/component-binding-infinite-loop/A.html
@@ -1,12 +1,8 @@
-<B bind:currentIdentifier />
-<B bind:currentIdentifier />
-
 <script>
-import B from './B.html';
+	import B from './B.html';
 
-export default {
-	components: {
-		B
-	}
-}
+	export let currentIdentifier;
 </script>
+
+<B bind:currentIdentifier />
+<B bind:currentIdentifier />
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-infinite-loop/B.html b/test/runtime/samples/component-binding-infinite-loop/B.html
index a4563bbdb2..72bbbe4110 100644
--- a/test/runtime/samples/component-binding-infinite-loop/B.html
+++ b/test/runtime/samples/component-binding-infinite-loop/B.html
@@ -1,20 +1,14 @@
+<script>
+	import C from './C.html';
+
+	export let list = [1, 2, 3, 2, 1];
+	export let currentIdentifier;
+</script>
+
 {#each list as item}
 	<p>
 		<C identifier="{item}" bind:currentIdentifier>
 			{item}
 		</C>
 	</p>
-{/each}
-
-<script>
-import C from './C.html';
-
-export default {
-	data: () => ({
-		list: [1, 2, 3, 2, 1]
-	}),
-	components: {
-		C
-	}
-}
-</script>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-infinite-loop/C.html b/test/runtime/samples/component-binding-infinite-loop/C.html
index 06c6465373..44a94bfd5a 100644
--- a/test/runtime/samples/component-binding-infinite-loop/C.html
+++ b/test/runtime/samples/component-binding-infinite-loop/C.html
@@ -1,23 +1,19 @@
-<span
-	on:click="toggle()"
-	class="{isCurrentlySelected ? 'selected' : ''}"
->
-	<slot></slot>
-</span>
-
 <script>
-export default {
-	computed: {
-		isCurrentlySelected: ({ currentIdentifier, identifier }) => currentIdentifier === identifier
-	},
-	methods: {
-		toggle() {
-			const isCurrentlySelected = this.get().isCurrentlySelected
+	export let currentIdentifier;
+	export let identifier;
+
+	function isCurrentlySelected() {
+		return currentIdentifier === identifier;
+	}
 
-			this.set({
-				currentIdentifier: isCurrentlySelected ? null : this.get().identifier
-			})
-		}
+	function toggle() {
+		currentIdentifier = isCurrentlySelected ? null : identifier
 	}
-}
 </script>
+
+<span
+	on:click="{toggle}"
+	class="{isCurrentlySelected() ? 'selected' : ''}"
+>
+	<slot></slot>
+</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-infinite-loop/main.html b/test/runtime/samples/component-binding-infinite-loop/main.html
index 19d43b4751..b896316960 100644
--- a/test/runtime/samples/component-binding-infinite-loop/main.html
+++ b/test/runtime/samples/component-binding-infinite-loop/main.html
@@ -1,17 +1,8 @@
-<A bind:currentIdentifier />
-<A bind:currentIdentifier />
-
 <script>
-import A from './A.html';
+	import A from './A.html';
 
-export default {
-	data() {
-		return {
-			currentIdentifier: 2
-		}
-	},
-	components: {
-		A
-	}
-}
-</script>
\ No newline at end of file
+	export let currentIdentifier = 2;
+</script>
+
+<A bind:currentIdentifier />
+<A bind:currentIdentifier />
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-invalid-identifier/Counter.html b/test/runtime/samples/component-binding-invalid-identifier/Counter.html
index afb4ac7d58..e2293b4a8d 100644
--- a/test/runtime/samples/component-binding-invalid-identifier/Counter.html
+++ b/test/runtime/samples/component-binding-invalid-identifier/Counter.html
@@ -1,14 +1,11 @@
-<button on:click='set({ "x-count": state["x-count"] + 1 })'>+1</button>
-
 <script>
-	export default {
-		data: () => ({
-			"x-count": 0
-		}),
-		computed: {
-			state(arg)  {
-				return arg;
-			}
-		}
-	};
+	export let undefined = 0;
+
+	function state() {
+		// [svelte-upgrade warning]
+		// this function needs to be manually rewritten
+		return arg;
+	}
 </script>
+
+<button on:click='{() => undefined += 1}'>+1</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-invalid-identifier/main.html b/test/runtime/samples/component-binding-invalid-identifier/main.html
index 90dcbfe34d..dd03f0ce2b 100644
--- a/test/runtime/samples/component-binding-invalid-identifier/main.html
+++ b/test/runtime/samples/component-binding-invalid-identifier/main.html
@@ -1,12 +1,8 @@
-<Counter bind:x-count='x'/>
-<p>count: {x}</p>
-
 <script>
 	import Counter from './Counter.html';
 
-	export default {
-		components: {
-			Counter
-		}
-	};
+	export let x;
 </script>
+
+<Counter bind:x-count='x'/>
+<p>count: {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-nested/Bar.html b/test/runtime/samples/component-binding-nested/Bar.html
index 7dd76eb933..9ed5c6f42c 100644
--- a/test/runtime/samples/component-binding-nested/Bar.html
+++ b/test/runtime/samples/component-binding-nested/Bar.html
@@ -1,12 +1,10 @@
-<button class='bar' on:click='set({ x: "q" })'>bar</button>
-<p>bar x: {x}</p>
-
-<Baz bind:x/>
-
 <script>
 	import Baz from './Baz.html';
 
-	export default {
-		components: { Baz }
-	};
+	export let x;
 </script>
+
+<button class='bar' on:click='{() => x = "q"}'>bar</button>
+<p>bar x: {x}</p>
+
+<Baz bind:x/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-nested/Baz.html b/test/runtime/samples/component-binding-nested/Baz.html
index 59cb40ec8d..cd2cb5d0d8 100644
--- a/test/runtime/samples/component-binding-nested/Baz.html
+++ b/test/runtime/samples/component-binding-nested/Baz.html
@@ -1,2 +1,2 @@
-<button class='baz' on:click='set({ x: "r" })'>baz</button>
-<p>baz x: {x}</p>
+<button class='baz' on:click='{() => x = "r"}'>baz</button>
+<p>baz x: {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-nested/Foo.html b/test/runtime/samples/component-binding-nested/Foo.html
index f29b4e4416..500480eae6 100644
--- a/test/runtime/samples/component-binding-nested/Foo.html
+++ b/test/runtime/samples/component-binding-nested/Foo.html
@@ -1,12 +1,10 @@
-<button class='foo' on:click='set({ x: "p" })'>foo</button>
-<p>foo x: {x}</p>
-
-<Bar bind:x/>
-
 <script>
 	import Bar from './Bar.html';
 
-	export default {
-		components: { Bar }
-	};
+	export let x;
 </script>
+
+<button class='foo' on:click='{() => x = "p"}'>foo</button>
+<p>foo x: {x}</p>
+
+<Bar bind:x/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-nested/main.html b/test/runtime/samples/component-binding-nested/main.html
index 948adb1a7e..cae8f4dc52 100644
--- a/test/runtime/samples/component-binding-nested/main.html
+++ b/test/runtime/samples/component-binding-nested/main.html
@@ -1,11 +1,9 @@
-<p>x: {x}</p>
-
-<Foo bind:x/>
-
 <script>
 	import Foo from './Foo.html';
 
-	export default {
-		components: { Foo }
-	};
+	export let x;
 </script>
+
+<p>x: {x}</p>
+
+<Foo bind:x/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-parent-supercedes-child/Counter.html b/test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
index d22f95d166..4ac9541b65 100644
--- a/test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
+++ b/test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
@@ -1,9 +1,5 @@
-<button on:click='set({ count: count + 1 })'>+1</button>
-
 <script>
-	export default {
-		data: () => ({
-			count: 0
-		})
-	};
+	export let count = 0;
 </script>
+
+<button on:click='{() => count += 1}'>+1</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-parent-supercedes-child/main.html b/test/runtime/samples/component-binding-parent-supercedes-child/main.html
index b75a15c7fe..4f85c10c84 100644
--- a/test/runtime/samples/component-binding-parent-supercedes-child/main.html
+++ b/test/runtime/samples/component-binding-parent-supercedes-child/main.html
@@ -1,16 +1,8 @@
-<Counter bind:count='x'/>
-<p>count: {x}</p>
-
 <script>
 	import Counter from './Counter.html';
 
-	export default {
-		data: () => ({
-			x: 10
-		}),
-
-		components: {
-			Counter
-		}
-	};
+	export let x = 10;
 </script>
+
+<Counter bind:count='x'/>
+<p>count: {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-self-destroying/Nested.html b/test/runtime/samples/component-binding-self-destroying/Nested.html
index 3fb5ca4da3..a3dc510afc 100644
--- a/test/runtime/samples/component-binding-self-destroying/Nested.html
+++ b/test/runtime/samples/component-binding-self-destroying/Nested.html
@@ -1 +1 @@
-<button on:click="set({show:false})">Hide</button>
\ No newline at end of file
+<button on:click="{() => show = false}">Hide</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-self-destroying/main.html b/test/runtime/samples/component-binding-self-destroying/main.html
index 1863a6b392..66b578f9bc 100644
--- a/test/runtime/samples/component-binding-self-destroying/main.html
+++ b/test/runtime/samples/component-binding-self-destroying/main.html
@@ -1,14 +1,10 @@
+<script>
+	import Nested from './Nested.html';
+	export let show;
+</script>
+
 {#if show}
 	<Nested bind:show/>
 {:else}
-	<button on:click="set({show:true})">Show</button>
-{/if}
-
-<script>
-	import Nested from './Nested.html';
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+	<button on:click="{() => show = true}">Show</button>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding/Counter.html b/test/runtime/samples/component-binding/Counter.html
index d22f95d166..4ac9541b65 100644
--- a/test/runtime/samples/component-binding/Counter.html
+++ b/test/runtime/samples/component-binding/Counter.html
@@ -1,9 +1,5 @@
-<button on:click='set({ count: count + 1 })'>+1</button>
-
 <script>
-	export default {
-		data: () => ({
-			count: 0
-		})
-	};
+	export let count = 0;
 </script>
+
+<button on:click='{() => count += 1}'>+1</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding/main.html b/test/runtime/samples/component-binding/main.html
index 8f534d85c9..bd97c1d183 100644
--- a/test/runtime/samples/component-binding/main.html
+++ b/test/runtime/samples/component-binding/main.html
@@ -1,12 +1,8 @@
-<Counter bind:count='x'/>
-<p>count: {x}</p>
-
 <script>
 	import Counter from './Counter.html';
 
-	export default {
-		components: {
-			Counter
-		}
-	};
+	export let x;
 </script>
+
+<Counter bind:count='x'/>
+<p>count: {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic-late/Widget.html b/test/runtime/samples/component-data-dynamic-late/Widget.html
index 3b966c83ee..242d51b65b 100644
--- a/test/runtime/samples/component-data-dynamic-late/Widget.html
+++ b/test/runtime/samples/component-data-dynamic-late/Widget.html
@@ -1 +1 @@
-<p>{p}</p>
+<p>{p}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic-late/main.html b/test/runtime/samples/component-data-dynamic-late/main.html
index 465fcea9e1..4c07837598 100644
--- a/test/runtime/samples/component-data-dynamic-late/main.html
+++ b/test/runtime/samples/component-data-dynamic-late/main.html
@@ -1,17 +1,10 @@
-{#if foo}
-	<Widget p='{q}'/>
-{/if}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data: () => ({
-			foo: false
-		}),
-
-		components: {
-			Widget
-		}
-	};
+	export let foo = false;
+	export let q;
 </script>
+
+{#if foo}
+	<Widget p='{q}'/>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic-shorthand/main.html b/test/runtime/samples/component-data-dynamic-shorthand/main.html
index deae244ac5..c6359fbc25 100644
--- a/test/runtime/samples/component-data-dynamic-shorthand/main.html
+++ b/test/runtime/samples/component-data-dynamic-shorthand/main.html
@@ -1,11 +1,9 @@
-<div>
-	<Widget {foo}/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget }
-	};
+	export let foo;
 </script>
+
+<div>
+	<Widget {foo}/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic/Widget.html b/test/runtime/samples/component-data-dynamic/Widget.html
index a60afb741c..b34c2ef085 100644
--- a/test/runtime/samples/component-data-dynamic/Widget.html
+++ b/test/runtime/samples/component-data-dynamic/Widget.html
@@ -1,4 +1,4 @@
 <p>foo: {foo}</p>
 <p>baz: {baz} ({typeof baz})</p>
 <p>qux: {qux}</p>
-<p>quux: {quux}</p>
+<p>quux: {quux}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic/main.html b/test/runtime/samples/component-data-dynamic/main.html
index 554d4980ad..7c796ca9b6 100644
--- a/test/runtime/samples/component-data-dynamic/main.html
+++ b/test/runtime/samples/component-data-dynamic/main.html
@@ -1,11 +1,12 @@
-<div>
-	<Widget foo='{bar}' baz='{40 + x}' qux='this is a {compound} string' quux='{go.deeper}'/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget }
-	};
+	export let bar;
+	export let x;
+	export let compound;
+	export let go;
 </script>
+
+<div>
+	<Widget foo='{bar}' baz='{40 + x}' qux='this is a {compound} string' quux='{go.deeper}'/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-empty/Widget.html b/test/runtime/samples/component-data-empty/Widget.html
index 0fbf16cc4e..d504b84374 100644
--- a/test/runtime/samples/component-data-empty/Widget.html
+++ b/test/runtime/samples/component-data-empty/Widget.html
@@ -1 +1 @@
-<p>foo: '{foo}'</p>
+<p>foo: '{foo}'</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-empty/main.html b/test/runtime/samples/component-data-empty/main.html
index 8b797c8a60..3989cd2319 100644
--- a/test/runtime/samples/component-data-empty/main.html
+++ b/test/runtime/samples/component-data-empty/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget foo=''/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget foo=''/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static-boolean-regression/main.html b/test/runtime/samples/component-data-static-boolean-regression/main.html
index 5f51d903b3..8207fef20e 100644
--- a/test/runtime/samples/component-data-static-boolean-regression/main.html
+++ b/test/runtime/samples/component-data-static-boolean-regression/main.html
@@ -1,10 +1,5 @@
-<Link x href="/cool"/>
-
 <script>
 	import Link from './Link.html';
-	export default {
-		components: {
-			Link
-		}
-	};
-</script>
\ No newline at end of file
+</script>
+
+<Link x href="/cool"/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static-boolean/Foo.html b/test/runtime/samples/component-data-static-boolean/Foo.html
index 0cc021325b..780198e0ef 100644
--- a/test/runtime/samples/component-data-static-boolean/Foo.html
+++ b/test/runtime/samples/component-data-static-boolean/Foo.html
@@ -1 +1 @@
-<p>x: {x} ({typeof x})</p>
+<p>x: {x} ({typeof x})</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static-boolean/main.html b/test/runtime/samples/component-data-static-boolean/main.html
index 7c5cf9d2eb..cfaef9dea3 100644
--- a/test/runtime/samples/component-data-static-boolean/main.html
+++ b/test/runtime/samples/component-data-static-boolean/main.html
@@ -1,9 +1,5 @@
-<Foo x/>
-
 <script>
 	import Foo from './Foo.html';
-
-	export default {
-		components: { Foo }
-	};
 </script>
+
+<Foo x/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static/Widget.html b/test/runtime/samples/component-data-static/Widget.html
index 69fc156eab..bf52f4acfb 100644
--- a/test/runtime/samples/component-data-static/Widget.html
+++ b/test/runtime/samples/component-data-static/Widget.html
@@ -1,2 +1,2 @@
 <p>foo: {foo}</p>
-<p>baz: {baz} ({typeof baz})</p>
+<p>baz: {baz} ({typeof baz})</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static/main.html b/test/runtime/samples/component-data-static/main.html
index c21df0c660..ec8e37c45e 100644
--- a/test/runtime/samples/component-data-static/main.html
+++ b/test/runtime/samples/component-data-static/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget foo='bar' baz={42}/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget foo='bar' baz={42}/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-event-not-stale/main.html b/test/runtime/samples/component-event-not-stale/main.html
index e244f596ad..1beacd0e2d 100644
--- a/test/runtime/samples/component-event-not-stale/main.html
+++ b/test/runtime/samples/component-event-not-stale/main.html
@@ -1,20 +1,15 @@
-<Button on:click="handleClick()">one</Button>
-<Button on:click="fire('value', {value})">two</Button>
-
 <script>
+	import { createEventDispatcher } from 'svelte';
 	import Button from './Button.html';
 
-	export default {
-		components: {
-			Button
-		},
+	const dispatch = createEventDispatcher();
 
-		methods: {
-			handleClick() {
-				const { value } = this.get();
-				this.fire('value', { value });
-			}
-		}
+	export let value;
 
+	function handleClick() {
+		dispatch('value', { value });
 	}
-</script>
\ No newline at end of file
+</script>
+
+<Button on:click="{handleClick}">one</Button>
+<Button on:click="{() => dispatch('value', {value})}">two</Button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events-console/main.html b/test/runtime/samples/component-events-console/main.html
index 13238f6c53..7b0c3fccda 100644
--- a/test/runtime/samples/component-events-console/main.html
+++ b/test/runtime/samples/component-events-console/main.html
@@ -1,9 +1,5 @@
-<Widget on:click="console.log('clicked')"/>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<Widget on:click="{() => console.log('clicked')}"/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events-data/Widget.html b/test/runtime/samples/component-events-data/Widget.html
index 5087ccc68e..30a3159b48 100644
--- a/test/runtime/samples/component-events-data/Widget.html
+++ b/test/runtime/samples/component-events-data/Widget.html
@@ -1,3 +1,9 @@
-<button on:click='fire("select", { selection: "foo" })'>select foo</button>
-<button on:click='fire("select", { selection: "bar" })'>select bar</button>
-<button on:click='fire("select", { selection: "baz" })'>select baz</button>
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("select", { selection: "foo" })}'>select foo</button>
+<button on:click='{() => dispatch("select", { selection: "bar" })}'>select bar</button>
+<button on:click='{() => dispatch("select", { selection: "baz" })}'>select baz</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events-data/main.html b/test/runtime/samples/component-events-data/main.html
index 75d457ee24..053b0bca11 100644
--- a/test/runtime/samples/component-events-data/main.html
+++ b/test/runtime/samples/component-events-data/main.html
@@ -1,11 +1,10 @@
-<div>
-	<Widget on:select='fire("select", event.selection)'/>
-</div>
-
 <script>
+	import { createEventDispatcher } from 'svelte';
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget }
-	};
+	const dispatch = createEventDispatcher();
 </script>
+
+<div>
+	<Widget on:select='{event => dispatch("select", event.selection)}'/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events-each/Widget.html b/test/runtime/samples/component-events-each/Widget.html
index ad81b51f15..205c67999b 100644
--- a/test/runtime/samples/component-events-each/Widget.html
+++ b/test/runtime/samples/component-events-each/Widget.html
@@ -1 +1,7 @@
-<button on:click='fire("foo")'>click me</button>
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("foo")}'>click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events-each/main.html b/test/runtime/samples/component-events-each/main.html
index 3d655c5df6..da9f69b381 100644
--- a/test/runtime/samples/component-events-each/main.html
+++ b/test/runtime/samples/component-events-each/main.html
@@ -1,19 +1,15 @@
-<div>
-	{#each items as item}
-		<Widget on:foo='foo(item)'/>
-	{/each}
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget },
+	export let items;
 
-		methods: {
-			foo ( item ) {
-				this.fire( 'foo', item );
-			}
-		}
-	};
+	function foo(item) {
+		dispatch( 'foo', item );
+	}
 </script>
+
+<div>
+	{#each items as item}
+		<Widget on:foo='{() => foo(item)}'/>
+	{/each}
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events-fire-finally/main.html b/test/runtime/samples/component-events-fire-finally/main.html
index bc56c4d894..9f26b637f0 100644
--- a/test/runtime/samples/component-events-fire-finally/main.html
+++ b/test/runtime/samples/component-events-fire-finally/main.html
@@ -1 +1 @@
-Foo
+Foo
\ No newline at end of file
diff --git a/test/runtime/samples/component-events/Widget.html b/test/runtime/samples/component-events/Widget.html
index 460a2a1c01..9b44ef57a8 100644
--- a/test/runtime/samples/component-events/Widget.html
+++ b/test/runtime/samples/component-events/Widget.html
@@ -1 +1 @@
-<p>i am a widget</p>
+<p>i am a widget</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-events/main.html b/test/runtime/samples/component-events/main.html
index eff15ef979..fc4839e027 100644
--- a/test/runtime/samples/component-events/main.html
+++ b/test/runtime/samples/component-events/main.html
@@ -1,13 +1,14 @@
-<div>
-	{#if visible}
-		<Widget on:destroy='fire("widgetTornDown")'/>
-	{/if}
-</div>
-
 <script>
+	import { createEventDispatcher } from 'svelte';
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget }
-	};
+	const dispatch = createEventDispatcher();
+
+	export let visible;
 </script>
+
+<div>
+	{#if visible}
+		<Widget on:destroy='{() => dispatch("widgetTornDown")}'/>
+	{/if}
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-if-placement/Component.html b/test/runtime/samples/component-if-placement/Component.html
index 04c4841d35..48d0e60ae2 100644
--- a/test/runtime/samples/component-if-placement/Component.html
+++ b/test/runtime/samples/component-if-placement/Component.html
@@ -1,3 +1,3 @@
 {#if true}
 	<span>Component</span>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-if-placement/main.html b/test/runtime/samples/component-if-placement/main.html
index 3f8c819fdd..175feeb6b5 100644
--- a/test/runtime/samples/component-if-placement/main.html
+++ b/test/runtime/samples/component-if-placement/main.html
@@ -1,14 +1,12 @@
+<script>
+	import Component from './Component.html';
+	export let flag;
+</script>
+
 <span>Before</span>
 {#if flag}
 	<Component/>
 {:else}
 	<Component/>
 {/if}
-<span>After</span>
-
-<script>
-	import Component from './Component.html';
-	export default {
-		components: { Component }
-	};
-</script>
+<span>After</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-invalid-identifier/Widget.html b/test/runtime/samples/component-invalid-identifier/Widget.html
index 779a912f2d..f4153b1cc8 100644
--- a/test/runtime/samples/component-invalid-identifier/Widget.html
+++ b/test/runtime/samples/component-invalid-identifier/Widget.html
@@ -1,10 +1,9 @@
-<p>{state["b-c"]}</p>
 <script>
-export default {
-    computed: {
-        state(states) {
-            return states;
-        }
-    }
-};
+    function state() {
+        // [svelte-upgrade warning]
+// this function needs to be manually rewritten
+    return states;
+}
 </script>
+
+<p>{state()["b-c"]}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-invalid-identifier/main.html b/test/runtime/samples/component-invalid-identifier/main.html
index 9a34311984..07831bf2cf 100644
--- a/test/runtime/samples/component-invalid-identifier/main.html
+++ b/test/runtime/samples/component-invalid-identifier/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget b-c="i am a widget"/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget b-c="i am a widget"/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-name-deconflicted/main.html b/test/runtime/samples/component-name-deconflicted/main.html
index c5595b73e0..03d43c357b 100644
--- a/test/runtime/samples/component-name-deconflicted/main.html
+++ b/test/runtime/samples/component-name-deconflicted/main.html
@@ -1,18 +1,11 @@
+<script>
+	import Nested from './Nested.html';
+
+	export let list = [1, 2];
+</script>
+
 {#each list as nested}
 	{#if true}
 		<Nested {nested}/>
 	{/if}
-{/each}
-
-<script>
-	import Nested from './Nested.html';
-
-	export default {
-		data: () => ({
-			list: [1, 2]
-		}),
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deep/Level1.html b/test/runtime/samples/component-nested-deep/Level1.html
index d483c9a0c0..246bc4dfb7 100644
--- a/test/runtime/samples/component-nested-deep/Level1.html
+++ b/test/runtime/samples/component-nested-deep/Level1.html
@@ -1,15 +1,8 @@
-<Level2>
-	<Level3 />
-</Level2>
-
 <script>
 	import Level2 from './Level2.html';
 	import Level3 from './Level3.html';
-	
-	export default {
-		components: {
-			Level2,
-			Level3
-		}
-	}
-</script>
\ No newline at end of file
+</script>
+
+<Level2>
+	<Level3 />
+</Level2>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deep/Level2.html b/test/runtime/samples/component-nested-deep/Level2.html
index 5b2ece36c5..4b992b5cb3 100644
--- a/test/runtime/samples/component-nested-deep/Level2.html
+++ b/test/runtime/samples/component-nested-deep/Level2.html
@@ -1,12 +1,6 @@
-<span>level 2</span>
-<slot></slot>
-
 <script>
 	import Level3 from './Level3.html';
-	
-	export default {
-		components: {
-			Level3
-		}
-	};
-</script>
\ No newline at end of file
+</script>
+
+<span>level 2</span>
+<slot></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deep/main.html b/test/runtime/samples/component-nested-deep/main.html
index d4882d5a6f..4a0ccdd09c 100644
--- a/test/runtime/samples/component-nested-deep/main.html
+++ b/test/runtime/samples/component-nested-deep/main.html
@@ -1,11 +1,5 @@
-<Level1 ref:l1 />
-
 <script>
 	import Level1 from './Level1.html';
-	
-	export default {
-		components: {
-			Level1
-		}
-	}
-</script>
\ No newline at end of file
+</script>
+
+<Level1 ref:l1 />
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level1.html b/test/runtime/samples/component-nested-deeper/Level1.html
index 2ad03fc0c6..273e1b61c8 100644
--- a/test/runtime/samples/component-nested-deeper/Level1.html
+++ b/test/runtime/samples/component-nested-deeper/Level1.html
@@ -1,3 +1,10 @@
+<script>
+	import Level2 from './Level2.html';
+	import Level3 from './Level3.html';
+	
+	export let values;
+</script>
+
 <div class="level1">
 	{#each values as value}
 		<h4>level 1 #{value}</h4>
@@ -7,16 +14,4 @@
 			</Level3>
 		</Level2>
 	{/each}
-</div>
-
-<script>
-	import Level2 from './Level2.html';
-	import Level3 from './Level3.html';
-	
-	export default {
-		components: {
-			Level2,
-			Level3
-		}
-	};
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/main.html b/test/runtime/samples/component-nested-deeper/main.html
index e0749d49c3..4c72ae6743 100644
--- a/test/runtime/samples/component-nested-deeper/main.html
+++ b/test/runtime/samples/component-nested-deeper/main.html
@@ -1,11 +1,7 @@
-<Level1 {values}/>
-
 <script>
 	import Level1 from './Level1.html';
 	
-	export default {
-		components: {
-			Level1
-		}
-	}
-</script>
\ No newline at end of file
+	export let values;
+</script>
+
+<Level1 {values}/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-not-void/Link.html b/test/runtime/samples/component-not-void/Link.html
index ca134c6130..18a6961518 100644
--- a/test/runtime/samples/component-not-void/Link.html
+++ b/test/runtime/samples/component-not-void/Link.html
@@ -1 +1 @@
-<p><slot></slot></p>
+<p><slot></slot></p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-not-void/main.html b/test/runtime/samples/component-not-void/main.html
index 99f9a931b4..0769c81092 100644
--- a/test/runtime/samples/component-not-void/main.html
+++ b/test/runtime/samples/component-not-void/main.html
@@ -1,11 +1,5 @@
-<Link>Hello</Link>
-
 <script>
 	import Link from './Link.html';
-
-	export default {
-		components: {
-			Link
-		}
-	};
 </script>
+
+<Link>Hello</Link>
\ No newline at end of file
diff --git a/test/runtime/samples/component-ref/Widget.html b/test/runtime/samples/component-ref/Widget.html
index c8cf786cc8..58ae4f96bc 100644
--- a/test/runtime/samples/component-ref/Widget.html
+++ b/test/runtime/samples/component-ref/Widget.html
@@ -1,9 +1,11 @@
-<p>i am a widget</p>
-
 <script>
-	export default {
-		oncreate () {
-			this.isWidget = true;
-		}
-	};
+	import { onmount } from 'svelte';
+
+	export let isWidget;
+
+	onmount(() => {
+		isWidget = true;
+	});
 </script>
+
+<p>i am a widget</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-ref/main.html b/test/runtime/samples/component-ref/main.html
index 162f6f5d23..3fd2143cd9 100644
--- a/test/runtime/samples/component-ref/main.html
+++ b/test/runtime/samples/component-ref/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget ref:widget/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget ref:widget/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-shorthand-import/Widget.html b/test/runtime/samples/component-shorthand-import/Widget.html
index 7ffdd798f3..10c1f07afe 100644
--- a/test/runtime/samples/component-shorthand-import/Widget.html
+++ b/test/runtime/samples/component-shorthand-import/Widget.html
@@ -1 +1 @@
-<p>This is the widget.</p>
+<p>This is the widget.</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-shorthand-import/main.html b/test/runtime/samples/component-shorthand-import/main.html
index 01320a9b39..cbcde3f1ed 100644
--- a/test/runtime/samples/component-shorthand-import/main.html
+++ b/test/runtime/samples/component-shorthand-import/main.html
@@ -1,5 +1,5 @@
-<Widget/>
-
 <script>
-	export default { components: { Widget: './Widget.html' } };
+	import Widget from './Widget.html';
 </script>
+
+<Widget/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-default/main.html b/test/runtime/samples/component-slot-default/main.html
index 3f5fad9363..4b9758e601 100644
--- a/test/runtime/samples/component-slot-default/main.html
+++ b/test/runtime/samples/component-slot-default/main.html
@@ -1,13 +1,7 @@
-<Nested ref:nested>
-	Hello
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
 </script>
+
+<Nested ref:nested>
+	Hello
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-dynamic/Nested.html b/test/runtime/samples/component-slot-dynamic/Nested.html
index ff66691089..da60b832e3 100644
--- a/test/runtime/samples/component-slot-dynamic/Nested.html
+++ b/test/runtime/samples/component-slot-dynamic/Nested.html
@@ -1,13 +1,7 @@
-<slot>
-	<span>{foo}</span>
-</slot>
-
 <script>
-	export default {
-		data() {
-			return {
-				foo: 'a'
-			};
-		}
-	};
+	export let foo = 'a';
 </script>
+
+<slot>
+	<span>{foo}</span>
+</slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-dynamic/main.html b/test/runtime/samples/component-slot-dynamic/main.html
index 348754d88c..c48d39d522 100644
--- a/test/runtime/samples/component-slot-dynamic/main.html
+++ b/test/runtime/samples/component-slot-dynamic/main.html
@@ -1,13 +1,7 @@
-<Nested ref:nested>
-	<p>override default slot</p>
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
 </script>
+
+<Nested ref:nested>
+	<p>override default slot</p>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-each-block/main.html b/test/runtime/samples/component-slot-each-block/main.html
index 05dd7421c0..911eb5c1ae 100644
--- a/test/runtime/samples/component-slot-each-block/main.html
+++ b/test/runtime/samples/component-slot-each-block/main.html
@@ -1,13 +1,11 @@
+<script>
+	import Nested from './Nested.html';
+
+	export let things;
+</script>
+
 <Nested>
 	{#each things as thing}
 		<span>{thing}</span>
 	{/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/runtime/samples/component-slot-empty/main.html b/test/runtime/samples/component-slot-empty/main.html
index 30b5cc73e3..3d76b0a696 100644
--- a/test/runtime/samples/component-slot-empty/main.html
+++ b/test/runtime/samples/component-slot-empty/main.html
@@ -1,12 +1,6 @@
-<Nested>
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
 </script>
+
+<Nested>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback/main.html b/test/runtime/samples/component-slot-fallback/main.html
index 8894e86940..96186f63d7 100644
--- a/test/runtime/samples/component-slot-fallback/main.html
+++ b/test/runtime/samples/component-slot-fallback/main.html
@@ -1,13 +1,7 @@
-<Nested ref:nested>
-	<p>not fallback</p>
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
 </script>
+
+<Nested ref:nested>
+	<p>not fallback</p>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-if-block-before-node/main.html b/test/runtime/samples/component-slot-if-block-before-node/main.html
index 30e04fb566..01ea1e8455 100644
--- a/test/runtime/samples/component-slot-if-block-before-node/main.html
+++ b/test/runtime/samples/component-slot-if-block-before-node/main.html
@@ -1,17 +1,13 @@
+<script>
+	import Nested from './Nested.html';
+
+	export let foo;
+</script>
+
 <Nested>
 	{#if foo}
 		<p>conditional</p>
 	{/if}
 
 	<p>unconditional</p>
-</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/runtime/samples/component-slot-if-block/main.html b/test/runtime/samples/component-slot-if-block/main.html
index e7ce5ce2a9..2b0405a471 100644
--- a/test/runtime/samples/component-slot-if-block/main.html
+++ b/test/runtime/samples/component-slot-if-block/main.html
@@ -1,17 +1,13 @@
+<script>
+	import Nested from './Nested.html';
+
+	export let foo;
+</script>
+
 <Nested>
 	<p>unconditional</p>
 
 	{#if foo}
 		<p>conditional</p>
 	{/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/runtime/samples/component-slot-if-else-block-before-node/main.html b/test/runtime/samples/component-slot-if-else-block-before-node/main.html
index 52e923780a..684497b98a 100644
--- a/test/runtime/samples/component-slot-if-else-block-before-node/main.html
+++ b/test/runtime/samples/component-slot-if-else-block-before-node/main.html
@@ -1,3 +1,9 @@
+<script>
+	import Nested from './Nested.html';
+
+	export let enabled;
+</script>
+
 <Nested>
 	{#if !enabled}
 		<p>disabled</p>
@@ -6,14 +12,4 @@
 	{/if}
 
 	<p>unconditional</p>
-</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/runtime/samples/component-slot-name-with-hyphen/main.html b/test/runtime/samples/component-slot-name-with-hyphen/main.html
index b3b6f8e9f6..bfb3b5c14f 100644
--- a/test/runtime/samples/component-slot-name-with-hyphen/main.html
+++ b/test/runtime/samples/component-slot-name-with-hyphen/main.html
@@ -1,13 +1,7 @@
-<Nested ref:nested>
-	<p slot="foo-bar">Hello</p>
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
 </script>
+
+<Nested ref:nested>
+	<p slot="foo-bar">Hello</p>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-named/main.html b/test/runtime/samples/component-slot-named/main.html
index 76ba5b072b..87d74226c5 100644
--- a/test/runtime/samples/component-slot-named/main.html
+++ b/test/runtime/samples/component-slot-named/main.html
@@ -1,16 +1,10 @@
+<script>
+	import Nested from './Nested.html';
+</script>
+
 <Nested ref:nested>
 	Hello
 
 	<p slot='foo'>foo</p>
 	<p slot='bar'>bar</p>
-</Nested>
-
-<script>
-	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-nested-component/main.html b/test/runtime/samples/component-slot-nested-component/main.html
index 2d094056c9..d86e58bb70 100644
--- a/test/runtime/samples/component-slot-nested-component/main.html
+++ b/test/runtime/samples/component-slot-nested-component/main.html
@@ -1,12 +1,8 @@
-<Outer>
-	<Inner>foo</Inner>
-</Outer>
-
 <script>
 	import Outer from './Outer.html';
 	import Inner from './Inner.html';
+</script>
 
-	export default {
-		components: { Outer, Inner }
-	};
-</script>
\ No newline at end of file
+<Outer>
+	<Inner>foo</Inner>
+</Outer>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-nested/main.html b/test/runtime/samples/component-slot-nested/main.html
index 226f9024ee..a109ec9c06 100644
--- a/test/runtime/samples/component-slot-nested/main.html
+++ b/test/runtime/samples/component-slot-nested/main.html
@@ -1,13 +1,7 @@
-<Nested>
-	<p slot='bar'>bar</p>
-</Nested>
-
 <script>
 	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
 </script>
+
+<Nested>
+	<p slot='bar'>bar</p>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-static-at-symbol/Email.html b/test/runtime/samples/component-static-at-symbol/Email.html
index f6b3b9f053..8af8c3d3b1 100644
--- a/test/runtime/samples/component-static-at-symbol/Email.html
+++ b/test/runtime/samples/component-static-at-symbol/Email.html
@@ -1 +1 @@
-<a href='mailto:{address}'>email</a>
+<a href='mailto:{address}'>email</a>
\ No newline at end of file
diff --git a/test/runtime/samples/component-static-at-symbol/main.html b/test/runtime/samples/component-static-at-symbol/main.html
index f8a0e1c6cd..275b922f6a 100644
--- a/test/runtime/samples/component-static-at-symbol/main.html
+++ b/test/runtime/samples/component-static-at-symbol/main.html
@@ -1,9 +1,5 @@
-<Email address='hello@example.com'/>
-
 <script>
 	import Email from './Email.html';
-
-	export default {
-		components: { Email },
-	};
 </script>
+
+<Email address='hello@example.com'/>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-follows-element/main.html b/test/runtime/samples/component-yield-follows-element/main.html
index 15747d9d53..b362e9a410 100644
--- a/test/runtime/samples/component-yield-follows-element/main.html
+++ b/test/runtime/samples/component-yield-follows-element/main.html
@@ -1,11 +1,5 @@
-<Foo>test</Foo>
-
 <script>
 	import Foo from './Foo.html';
-
-	export default {
-		components: {
-			Foo
-		}
-	};
 </script>
+
+<Foo>test</Foo>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-if/Widget.html b/test/runtime/samples/component-yield-if/Widget.html
index 2649b132e4..209f43ae8e 100644
--- a/test/runtime/samples/component-yield-if/Widget.html
+++ b/test/runtime/samples/component-yield-if/Widget.html
@@ -1,15 +1,9 @@
+<script>
+	export let show = false;
+</script>
+
 <p>
 	{#if show}
 		<slot></slot>
 	{/if}
-</p>
-
-<script>
-	export default {
-		data () {
-			return {
-				show: false
-			};
-		}
-	};
-</script>
+</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-if/main.html b/test/runtime/samples/component-yield-if/main.html
index 974865f61c..a006c84caf 100644
--- a/test/runtime/samples/component-yield-if/main.html
+++ b/test/runtime/samples/component-yield-if/main.html
@@ -1,17 +1,9 @@
-<div>
-	<Widget ref:widget>{data}</Widget>
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget },
-
-		data() {
-			return {
-				data: "Hello"
-			};
-		}
-	};
+	export let data = "Hello";
 </script>
+
+<div>
+	<Widget ref:widget>{data}</Widget>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-multiple-in-each/Widget.html b/test/runtime/samples/component-yield-multiple-in-each/Widget.html
index ca134c6130..18a6961518 100644
--- a/test/runtime/samples/component-yield-multiple-in-each/Widget.html
+++ b/test/runtime/samples/component-yield-multiple-in-each/Widget.html
@@ -1 +1 @@
-<p><slot></slot></p>
+<p><slot></slot></p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-multiple-in-each/main.html b/test/runtime/samples/component-yield-multiple-in-each/main.html
index efc4f382e3..5f2027ee98 100644
--- a/test/runtime/samples/component-yield-multiple-in-each/main.html
+++ b/test/runtime/samples/component-yield-multiple-in-each/main.html
@@ -1,19 +1,9 @@
-{#each people as person}
-	<Widget>Hello {person}</Widget>
-{/each}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data () {
-			return {
-				people: [ 'Alice', 'Bob', 'Charles' ]
-			};
-		},
-
-		components: {
-			Widget
-		}
-	};
+	export let people = [ 'Alice', 'Bob', 'Charles' ];
 </script>
+
+{#each people as person}
+	<Widget>Hello {person}</Widget>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-multiple-in-if/Widget.html b/test/runtime/samples/component-yield-multiple-in-if/Widget.html
index 0be5224893..0f4848b8a4 100644
--- a/test/runtime/samples/component-yield-multiple-in-if/Widget.html
+++ b/test/runtime/samples/component-yield-multiple-in-if/Widget.html
@@ -1 +1 @@
-<p class='widget'><slot></slot></p>
+<p class='widget'><slot></slot></p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-multiple-in-if/main.html b/test/runtime/samples/component-yield-multiple-in-if/main.html
index d59276292f..53eba749d6 100644
--- a/test/runtime/samples/component-yield-multiple-in-if/main.html
+++ b/test/runtime/samples/component-yield-multiple-in-if/main.html
@@ -1,23 +1,13 @@
+<script>
+	import Widget from './Widget.html';
+
+	export let arriving = true;
+</script>
+
 <div>
 	{#if arriving}
 		<Widget>Hello</Widget>
 	{:else}
 		<Widget>Goodbye</Widget>
 	{/if}
-</div>
-
-<script>
-	import Widget from './Widget.html';
-
-	export default {
-		data () {
-			return {
-				arriving: true
-			}
-		},
-
-		components: {
-			Widget
-		}
-	};
-</script>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-nested-if/Inner.html b/test/runtime/samples/component-yield-nested-if/Inner.html
index d87e45af56..62120162a9 100644
--- a/test/runtime/samples/component-yield-nested-if/Inner.html
+++ b/test/runtime/samples/component-yield-nested-if/Inner.html
@@ -1 +1 @@
-Inner
+Inner
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-nested-if/Outer.html b/test/runtime/samples/component-yield-nested-if/Outer.html
index 7a5960212a..1d5fd34e1a 100644
--- a/test/runtime/samples/component-yield-nested-if/Outer.html
+++ b/test/runtime/samples/component-yield-nested-if/Outer.html
@@ -1,3 +1,3 @@
 {#if foo}
 	<slot></slot>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-nested-if/main.html b/test/runtime/samples/component-yield-nested-if/main.html
index 36dff0028e..98c27812e6 100644
--- a/test/runtime/samples/component-yield-nested-if/main.html
+++ b/test/runtime/samples/component-yield-nested-if/main.html
@@ -1,14 +1,11 @@
-<Outer {foo}>
-	One
-	<Inner/>
-</Outer>
-
 <script>
 	import Outer from './Outer.html';
 	import Inner from './Inner.html';
 
-	export default {
-		data: () => ({ foo: true }),
-		components: { Outer, Inner }
-	};
+	export let foo = true;
 </script>
+
+<Outer {foo}>
+	One
+	<Inner/>
+</Outer>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-parent/Widget.html b/test/runtime/samples/component-yield-parent/Widget.html
index ca134c6130..18a6961518 100644
--- a/test/runtime/samples/component-yield-parent/Widget.html
+++ b/test/runtime/samples/component-yield-parent/Widget.html
@@ -1 +1 @@
-<p><slot></slot></p>
+<p><slot></slot></p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-parent/main.html b/test/runtime/samples/component-yield-parent/main.html
index 5b0a4b4f93..b36dbc1b14 100644
--- a/test/runtime/samples/component-yield-parent/main.html
+++ b/test/runtime/samples/component-yield-parent/main.html
@@ -1,14 +1,8 @@
-<div>
-	<Widget>{data}</Widget>
-</div>
 <script>
 	import Widget from './Widget.html'
-	export default {
-		components: { Widget },
-		data(){
-			return {
-				data: "Hello"
-			}
-		}
-	}
+	export let data = "Hello";
 </script>
+
+<div>
+	<Widget>{data}</Widget>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-placement/Modal.html b/test/runtime/samples/component-yield-placement/Modal.html
index 0da768c450..225e9e2f37 100644
--- a/test/runtime/samples/component-yield-placement/Modal.html
+++ b/test/runtime/samples/component-yield-placement/Modal.html
@@ -1,6 +1,6 @@
-<div class='modal-background' on:click='destroy()'></div>
+<div class='modal-background' on:click='{destroy}'></div>
 
 <div class='modal'>
 	<slot></slot>
-	<button on:click='destroy()'>close modal</button>
+	<button on:click='{destroy}'>close modal</button>
 </div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-placement/main.html b/test/runtime/samples/component-yield-placement/main.html
index cbcf697a4a..cc5bfd73ed 100644
--- a/test/runtime/samples/component-yield-placement/main.html
+++ b/test/runtime/samples/component-yield-placement/main.html
@@ -1,15 +1,13 @@
+<script>
+	import Modal from './Modal.html';
+
+	export let showModal;
+</script>
+
 {#if showModal}
-	<Modal on:destroy='set({ showModal: false })'>
+	<Modal on:destroy='{() => showModal = false}'>
 		<h2>Hello!</h2>
 	</Modal>
 {:else}
-	<button on:click='set({ showModal: true })'>show modal</button>
-{/if}
-
-<script>
-	import Modal from './Modal.html';
-
-	export default {
-		components: { Modal }
-	};
-</script>
\ No newline at end of file
+	<button on:click='{() => showModal = true}'>show modal</button>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-static/Widget.html b/test/runtime/samples/component-yield-static/Widget.html
index 26a00b9191..aa6c6abd76 100644
--- a/test/runtime/samples/component-yield-static/Widget.html
+++ b/test/runtime/samples/component-yield-static/Widget.html
@@ -1 +1 @@
-<b><slot></slot></b>
+<b><slot></slot></b>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-static/main.html b/test/runtime/samples/component-yield-static/main.html
index a9ca474d58..9d5807872d 100644
--- a/test/runtime/samples/component-yield-static/main.html
+++ b/test/runtime/samples/component-yield-static/main.html
@@ -1,12 +1,7 @@
-<Widget>Hello</Widget> {name}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget },
-		data() {
-			return { name: '' };
-		}
-	};
+	export let name = '';
 </script>
+
+<Widget>Hello</Widget> {name}
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield/main.html b/test/runtime/samples/component-yield/main.html
index b8a5b648c5..ff1ec93b04 100644
--- a/test/runtime/samples/component-yield/main.html
+++ b/test/runtime/samples/component-yield/main.html
@@ -1,16 +1,10 @@
+<script>
+	export let test = true;
+</script>
+
 <p>
 	Hello
 	{#if test}
 		<slot></slot>
 	{/if}
-</p>
-
-<script>
-	export default {
-		data () {
-			return {
-				test: true
-			};
-		}
-	};
-</script>
+</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component/Widget.html b/test/runtime/samples/component/Widget.html
index 460a2a1c01..9b44ef57a8 100644
--- a/test/runtime/samples/component/Widget.html
+++ b/test/runtime/samples/component/Widget.html
@@ -1 +1 @@
-<p>i am a widget</p>
+<p>i am a widget</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component/main.html b/test/runtime/samples/component/main.html
index 5b119b5527..1bd0073a0e 100644
--- a/test/runtime/samples/component/main.html
+++ b/test/runtime/samples/component/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-empty/main.html b/test/runtime/samples/computed-empty/main.html
index 9dd0e10923..d11d41fa35 100644
--- a/test/runtime/samples/computed-empty/main.html
+++ b/test/runtime/samples/computed-empty/main.html
@@ -1,14 +1,9 @@
-<div>empty</div>
 <script>
-	export default {
-		data () {
-			return {};
-		},
+	import { onmount } from 'svelte';
 
-		computed: {},
-
-		oncreate () {
-			this.set({ created: true });
-		}
-	};
+	onmount(() => {
+		created = true;
+	});
 </script>
+
+<div>empty</div>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-function/main.html b/test/runtime/samples/computed-function/main.html
index a432252166..00a0a83c6a 100644
--- a/test/runtime/samples/computed-function/main.html
+++ b/test/runtime/samples/computed-function/main.html
@@ -1,20 +1,14 @@
-<p>{scale(x)}</p>
-
 <script>
-	export default {
-		data: () => ({
-			x: 5,
-			domain: [ 0, 10 ],
-			range: [ 0, 100 ]
-		}),
+	export let domain = [ 0, 10 ];
+	export let range = [ 0, 100 ];
+	export let x = 5;
 
-		computed: {
-			scale: ({ domain, range }) => {
-				return num => {
-					const t = domain[0] + ( num - domain[0] ) / ( domain[1] - domain[0] );
-					return range[0] + t * ( range[1] - range[0] );
-				}
-			}
+	function scale() {
+		return num => {
+			const t = domain[0] + ( num - domain[0] ) / ( domain[1] - domain[0] );
+			return range[0] + t * ( range[1] - range[0] );
 		}
-	};
+	}
 </script>
+
+<p>{scale()(x)}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-state-object/_config.js b/test/runtime/samples/computed-state-object/_config.js
deleted file mode 100644
index d9fc4d82ba..0000000000
--- a/test/runtime/samples/computed-state-object/_config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-	data: { a: 1 },
-
-	html: `
-		<p>a: 1</p>
-		<p>x: 2</p>
-		<p>y: 4</p>
-		<p>z: 8</p>
-	`,
-
-	test(assert, component, target) {
-		component.set({ a: 2 });
-
-		assert.htmlEqual(target.innerHTML, `
-			<p>a: 2</p>
-			<p>x: 4</p>
-			<p>y: 8</p>
-			<p>z: 16</p>
-		`)
-	},
-};
diff --git a/test/runtime/samples/computed-state-object/main.html b/test/runtime/samples/computed-state-object/main.html
deleted file mode 100644
index c8c313c8fb..0000000000
--- a/test/runtime/samples/computed-state-object/main.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<p>a: {a}</p>
-<p>x: {x}</p>
-<p>y: {y}</p>
-<p>z: {z}</p>
-
-<script>
-	export default {
-		computed: {
-			y: state => state.x * 2,
-			z: state => state.y * 2,
-			x: ({ a }) => a * 2
-		}
-	};
-</script>
diff --git a/test/runtime/samples/computed-values-deconflicted/main.html b/test/runtime/samples/computed-values-deconflicted/main.html
index e5a016084c..18937d8093 100644
--- a/test/runtime/samples/computed-values-deconflicted/main.html
+++ b/test/runtime/samples/computed-values-deconflicted/main.html
@@ -1,14 +1,9 @@
-<span>{state}</span>
-
 <script>
-	export default {
-		data() {
-			return {
-				x: 'waiting'
-			};
-		},
-		computed: {
-			state: ({ x }) => x
-		}
-	};
-</script>
\ No newline at end of file
+	export let x = 'waiting';
+
+	function state() {
+		return x;
+	}
+</script>
+
+<span>{state()}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-values-function-dependency/main.html b/test/runtime/samples/computed-values-function-dependency/main.html
index adf66137fa..dc61cee915 100644
--- a/test/runtime/samples/computed-values-function-dependency/main.html
+++ b/test/runtime/samples/computed-values-function-dependency/main.html
@@ -1,5 +1,3 @@
-<p>{x}</p>
-
 <script>
 	let _x;
 
@@ -7,22 +5,16 @@
 		return _x;
 	}
 
-	export default {
-		data () {
-			return {
-				y: 1
-			};
-		},
+	export let y = 1;
+
+	function xGetter() {
+		_x = y * 2;
+		return getX;
+	}
 
-		computed: {
-			xGetter ({ y }) {
-				_x = y * 2;
-				return getX;
-			},
+	function x() {
+		return xGetter()();
+	}
+</script>
 
-			x ({ xGetter }) {
-				return xGetter();
-			}
-		}
-	};
-</script>
\ No newline at end of file
+<p>{x()}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-values/main.html b/test/runtime/samples/computed-values/main.html
index 7e4f8d7728..1af546bc06 100644
--- a/test/runtime/samples/computed-values/main.html
+++ b/test/runtime/samples/computed-values/main.html
@@ -1,16 +1,15 @@
-<p>{a} + {b} = {c}</p>
-<p>{c} * {c} = {cSquared}</p>
-
 <script>
-	export default {
-		data: () => ({
-			a: 1,
-			b: 2
-		}),
+	export let a = 1;
+	export let b = 2;
+
+	function c() {
+		return a + b;
+	}
 
-		computed: {
-			c: ({ a, b }) => a + b,
-			cSquared: ({ c }) => c * c
-		}
-	};
+	function cSquared() {
+		return c() * c();
+	}
 </script>
+
+<p>{a} + {b} = {c()}</p>
+<p>{c()} * {c()} = {cSquared()}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-whole-state/_config.js b/test/runtime/samples/computed-whole-state/_config.js
deleted file mode 100644
index 0281827b4b..0000000000
--- a/test/runtime/samples/computed-whole-state/_config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default {
-	html: `
-		<pre>{"wanted":2}</pre>
-	`,
-
-	test(assert, component, target) {
-		component.set({
-			unwanted: 3,
-			wanted: 4,
-		});
-
-		assert.htmlEqual(target.innerHTML, `
-			<pre>{"wanted":4}</pre>
-		`);
-
-		component.set({
-			unwanted: 5,
-			wanted: 6,
-		});
-
-		assert.htmlEqual(target.innerHTML, `
-			<pre>{"wanted":6}</pre>
-		`);
-	},
-};
diff --git a/test/runtime/samples/computed-whole-state/main.html b/test/runtime/samples/computed-whole-state/main.html
deleted file mode 100644
index 476d11cc8b..0000000000
--- a/test/runtime/samples/computed-whole-state/main.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<pre>{JSON.stringify(props)}</pre>
-<script>
-	export default {
-		data: () => ({
-			unwanted: 1,
-			wanted: 2
-		}),
-
-		helpers: {
-			// prevent this being mixed in with data
-			JSON
-		},
-
-		computed: {
-      props: (state) => {
-				var result = Object.assign({}, state);
-				delete result.unwanted;
-				return result;
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/css-comments/main.html b/test/runtime/samples/css-comments/main.html
index 68eebfdf38..008cbae63e 100644
--- a/test/runtime/samples/css-comments/main.html
+++ b/test/runtime/samples/css-comments/main.html
@@ -8,4 +8,4 @@
 	p {
 		color: red;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/runtime/samples/css-false/Widget.html b/test/runtime/samples/css-false/Widget.html
index 1d893b8bcd..da7fd4e8b7 100644
--- a/test/runtime/samples/css-false/Widget.html
+++ b/test/runtime/samples/css-false/Widget.html
@@ -4,4 +4,4 @@
 	p {
 		color: red;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/runtime/samples/css-false/main.html b/test/runtime/samples/css-false/main.html
index 70e77bd59b..dbbc5c325b 100644
--- a/test/runtime/samples/css-false/main.html
+++ b/test/runtime/samples/css-false/main.html
@@ -1,10 +1,6 @@
-<p>control</p>
-<Widget/>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<p>control</p>
+<Widget/>
\ No newline at end of file
diff --git a/test/runtime/samples/css-space-in-attribute/Widget.html b/test/runtime/samples/css-space-in-attribute/Widget.html
index 929e1d40b0..b812ed8816 100644
--- a/test/runtime/samples/css-space-in-attribute/Widget.html
+++ b/test/runtime/samples/css-space-in-attribute/Widget.html
@@ -8,4 +8,4 @@
 	[class*=" bar"] {
 		background: black;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/runtime/samples/css-space-in-attribute/main.html b/test/runtime/samples/css-space-in-attribute/main.html
index 211e42721a..93bec897f3 100644
--- a/test/runtime/samples/css-space-in-attribute/main.html
+++ b/test/runtime/samples/css-space-in-attribute/main.html
@@ -1,10 +1,6 @@
-<p class='foo bar'>control</p>
-<Widget/>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<p class='foo bar'>control</p>
+<Widget/>
\ No newline at end of file
diff --git a/test/runtime/samples/css/Widget.html b/test/runtime/samples/css/Widget.html
index ad2b7e681d..43328db0fd 100644
--- a/test/runtime/samples/css/Widget.html
+++ b/test/runtime/samples/css/Widget.html
@@ -4,4 +4,4 @@
 	p {
 		color: #f00;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/test/runtime/samples/css/main.html b/test/runtime/samples/css/main.html
index 70e77bd59b..dbbc5c325b 100644
--- a/test/runtime/samples/css/main.html
+++ b/test/runtime/samples/css/main.html
@@ -1,10 +1,6 @@
-<p>control</p>
-<Widget/>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<p>control</p>
+<Widget/>
\ No newline at end of file
diff --git a/test/runtime/samples/custom-method/main.html b/test/runtime/samples/custom-method/main.html
index 0f1ad3387c..cd1f4ec454 100644
--- a/test/runtime/samples/custom-method/main.html
+++ b/test/runtime/samples/custom-method/main.html
@@ -1,21 +1,15 @@
-<button on:click='add1()'>+1</button>
-
-<p>{counter}</p>
-
 <script>
-	export default {
-		data: () => ({
-			counter: 0
-		}),
+	export let counter = 0;
 
-		methods: {
-			add1 () {
-				this.set({ counter: this.get().counter + 1 });
-			},
+	function add1() {
+		counter += 1;
+	}
 
-			foo () {
-				return 42;
-			}
-		}
-	};
+	export function foo() {
+		return 42;
+	}
 </script>
+
+<button on:click='{add1}'>+1</button>
+
+<p>{counter}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-builtins/main.html b/test/runtime/samples/deconflict-builtins/main.html
index 4da19ce0c4..7196d3eb5e 100644
--- a/test/runtime/samples/deconflict-builtins/main.html
+++ b/test/runtime/samples/deconflict-builtins/main.html
@@ -1,13 +1,7 @@
-<span>{foo}</span>
-
 <script>
 	import { get } from './get.js';
 
-	export default {
-		data () {
-			return {
-				foo: get()
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let foo = get();
+</script>
+
+<span>{foo}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-elements-indexes/main.html b/test/runtime/samples/deconflict-elements-indexes/main.html
index ce6de6b086..c506848bdf 100644
--- a/test/runtime/samples/deconflict-elements-indexes/main.html
+++ b/test/runtime/samples/deconflict-elements-indexes/main.html
@@ -1,24 +1,15 @@
+<script>
+	export let tagList = ['one'];
+
+	function remove(index) {
+		// ...
+	}
+</script>
+
 <div>
 	{#each tagList as tag, i}
-		<i on:click='remove(i)'>
+		<i on:click='{() => remove(i)}'>
 			{tag}
 		</i>
 	{/each}
-</div>
-
-<script>
-	export default {
-		data() {
-			return {
-				inProgress: false,
-				tagList: ['one']
-			};
-		},
-
-		methods: {
-			remove(index) {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-non-helpers/main.html b/test/runtime/samples/deconflict-non-helpers/main.html
index d6ee1eaeae..a034fd58fb 100644
--- a/test/runtime/samples/deconflict-non-helpers/main.html
+++ b/test/runtime/samples/deconflict-non-helpers/main.html
@@ -1,17 +1,14 @@
-{compute}
 <script>
 	import { addCss, addedCss, applyComputations, renderMainFragment } from './module.js';
 
-	export default {
-		data() {
-			return {
-				value: addCss + addedCss + applyComputations + renderMainFragment
-			};
-		},
-		computed: {
-			compute: ({ value }) => value.toUpperCase()
-		}
-	};
+	export let value = addCss + addedCss + applyComputations + renderMainFragment;
+
+	function compute() {
+		return value.toUpperCase();
+	}
 </script>
+
+{compute()}
+
 <style>
 </style>
diff --git a/test/runtime/samples/deconflict-self/main.html b/test/runtime/samples/deconflict-self/main.html
index a9ddc8ac69..30f524eb69 100644
--- a/test/runtime/samples/deconflict-self/main.html
+++ b/test/runtime/samples/deconflict-self/main.html
@@ -1,9 +1,5 @@
-<Main/>
-
 <script>
 	import Main from './nested/main.html';
+</script>
 
-	export default {
-		components: { Main }
-	};
-</script>
\ No newline at end of file
+<Main/>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-template-1/main.html b/test/runtime/samples/deconflict-template-1/main.html
index 395d7b22b3..70fc1997bd 100644
--- a/test/runtime/samples/deconflict-template-1/main.html
+++ b/test/runtime/samples/deconflict-template-1/main.html
@@ -1,13 +1,7 @@
-{value}
-
 <script>
 	import { template } from './module.js';
 
-	export default {
-		data() {
-			return {
-				value: template
-			};
-		}
-	};
+	export let value = template;
 </script>
+
+{value}
diff --git a/test/runtime/samples/deconflict-template-2/main.html b/test/runtime/samples/deconflict-template-2/main.html
index 79f76724ed..0c2fae81de 100644
--- a/test/runtime/samples/deconflict-template-2/main.html
+++ b/test/runtime/samples/deconflict-template-2/main.html
@@ -1,15 +1,9 @@
-{value}
-
 <script>
-	export default {
-		data() {
-			return {
-				value: template()
-			};
-		}
-	};
+	export let value = template();
 
 	function template() {
 		return 'template';
 	}
 </script>
+
+{value}
diff --git a/test/runtime/samples/deconflict-vars/main.html b/test/runtime/samples/deconflict-vars/main.html
index ed2cd6c4a9..72ab82f2c9 100644
--- a/test/runtime/samples/deconflict-vars/main.html
+++ b/test/runtime/samples/deconflict-vars/main.html
@@ -1,5 +1,3 @@
-<p>{value}</p>
-
 <script>
 	function throwError() {
 		throw new Error('nope');
@@ -8,13 +6,7 @@
 	const createElement = throwError;
 	const createElement$ = throwError;
 
-	export default {
-		data() {
-			return {
-				value: template() + template$()
-			};
-		}
-	};
+	export let value = template() + template$();
 
 	function template() {
 		return 'a';
@@ -24,3 +16,5 @@
 		return 'b';
 	}
 </script>
+
+<p>{value}</p>
diff --git a/test/runtime/samples/default-data-function/main.html b/test/runtime/samples/default-data-function/main.html
index 5225b6c3cd..57d2df771d 100644
--- a/test/runtime/samples/default-data-function/main.html
+++ b/test/runtime/samples/default-data-function/main.html
@@ -1,9 +1,5 @@
-<h1>Hello {name()}!</h1>
-
 <script>
-	export default {
-		data: () => ({
-			name: () => 'world'
-		})
-	};
+	export let name = () => 'world';
 </script>
+
+<h1>Hello {name()}!</h1>
diff --git a/test/runtime/samples/default-data-override/main.html b/test/runtime/samples/default-data-override/main.html
index afd9e23a73..a8d2fcfb7b 100644
--- a/test/runtime/samples/default-data-override/main.html
+++ b/test/runtime/samples/default-data-override/main.html
@@ -1,9 +1,5 @@
-<h1>Hello {name}!</h1>
-
 <script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
+	export let name = 'world';
 </script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/runtime/samples/default-data/main.html b/test/runtime/samples/default-data/main.html
index afd9e23a73..a8d2fcfb7b 100644
--- a/test/runtime/samples/default-data/main.html
+++ b/test/runtime/samples/default-data/main.html
@@ -1,9 +1,5 @@
-<h1>Hello {name}!</h1>
-
 <script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
+	export let name = 'world';
 </script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/runtime/samples/destructuring/main.html b/test/runtime/samples/destructuring/main.html
index 5d98aaae1e..956d3c0476 100644
--- a/test/runtime/samples/destructuring/main.html
+++ b/test/runtime/samples/destructuring/main.html
@@ -1 +1,7 @@
-<button on:click='fire("foo", { foo })'>click me</button>
\ No newline at end of file
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("foo", { foo })}'>click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-accept-declarative-store/main.html b/test/runtime/samples/dev-accept-declarative-store/main.html
index a20bbf0d65..34ae31d3b9 100644
--- a/test/runtime/samples/dev-accept-declarative-store/main.html
+++ b/test/runtime/samples/dev-accept-declarative-store/main.html
@@ -1,11 +1,14 @@
-<p>{$foo}</p>
-
 <script>
-import { Store } from '../../../../store.js';
+	import { Store } from '../../../../store.js';
 
 const store = new Store({ foo : "foo" });
 
-export default {
-	store : () => store,
-};
+/*
+	svelte-upgrade cannot automatically transform this code —
+	it must be updated manually
+
+	store : () => store
+	*/
 </script>
+
+<p>{$foo}</p>
diff --git a/test/runtime/samples/dev-warning-bad-set-argument/_config.js b/test/runtime/samples/dev-warning-bad-set-argument/_config.js
deleted file mode 100644
index 4625bc09e5..0000000000
--- a/test/runtime/samples/dev-warning-bad-set-argument/_config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default {
-	compileOptions: {
-		dev: true
-	},
-
-	error(assert, error) {
-		assert.equal(error.message, `<Main$>.set was called without an object of data key-values to update.`);
-	}
-};
diff --git a/test/runtime/samples/dev-warning-bad-set-argument/main.html b/test/runtime/samples/dev-warning-bad-set-argument/main.html
deleted file mode 100644
index cbaf739b10..0000000000
--- a/test/runtime/samples/dev-warning-bad-set-argument/main.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-	export default {
-		data() {
-			return { key : false };
-		},
-
-		oncreate() {
-			this.set("key", true);
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html
index eb6e7d8e8e..4bf3b848c4 100644
--- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html
+++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html
@@ -1,13 +1,10 @@
-<svelte:component this="{x ? Foo : Bar}"/>
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		components: {
-			Foo,
-			Bar
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+	export let Foo;
+	export let Bar;
+</script>
+
+<svelte:component this="{x ? Foo : Bar}"/>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-helper/main.html b/test/runtime/samples/dev-warning-helper/main.html
index 07d261a81d..56ddbf1c5d 100644
--- a/test/runtime/samples/dev-warning-helper/main.html
+++ b/test/runtime/samples/dev-warning-helper/main.html
@@ -1,11 +1,9 @@
-{foo(bar)}
-
 <script>
-	export default {
-		helpers: {
-			foo ( bar ) {
-				return bar * 2;
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	export let bar;
+
+	function foo(bar) {
+		return bar * 2;
+	}
+</script>
+
+{foo(bar)}
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-missing-data-excludes-event/main.html b/test/runtime/samples/dev-warning-missing-data-excludes-event/main.html
index ae30c7f05d..1c420cfcfa 100644
--- a/test/runtime/samples/dev-warning-missing-data-excludes-event/main.html
+++ b/test/runtime/samples/dev-warning-missing-data-excludes-event/main.html
@@ -1 +1 @@
-<button on:click='console.log(event)'>click me</button>
+<button on:click='{event => console.log(event)}'>click me</button>
diff --git a/test/runtime/samples/dev-warning-readonly-computed/main.html b/test/runtime/samples/dev-warning-readonly-computed/main.html
index 199aac1a9c..3c395561e1 100644
--- a/test/runtime/samples/dev-warning-readonly-computed/main.html
+++ b/test/runtime/samples/dev-warning-readonly-computed/main.html
@@ -1,7 +1,7 @@
 <script>
-	export default {
-		computed: {
-			foo: ({ a }) => a + 1
-		}
-	};
+	export let a;
+
+	export function foo() {
+		return a + 1;
+	}
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/document-event/main.html b/test/runtime/samples/document-event/main.html
index 4e6aa93512..104c6f4a9b 100644
--- a/test/runtime/samples/document-event/main.html
+++ b/test/runtime/samples/document-event/main.html
@@ -1,12 +1,9 @@
-<svelte:document on:mouseenter='log("enter")' on:mouseleave='log("leave")'/>
-
 <script>
-	export default {
-		data: () => ({ events: [] }),
-		methods: {
-			log(event) {
-				this.set({ events: this.get().events.concat(event) });
-			},
-		},
-	};
-</script>
\ No newline at end of file
+	export let events = [];
+
+	function log(event) {
+		events = this.get().events.concat(event);
+	}
+</script>
+
+<svelte:document on:mouseenter='{() => log("enter")}' on:mouseleave='{() => log("leave")}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated-b/Green.html b/test/runtime/samples/dynamic-component-bindings-recreated-b/Green.html
index cb1506bfdb..613d3ff52a 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated-b/Green.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated-b/Green.html
@@ -1,11 +1,5 @@
-<p>green {foo}</p>
-
 <script>
-	export default {
-		data() {
-			return {
-				foo: 'green'
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let foo = 'green';
+</script>
+
+<p>green {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated-b/Red.html b/test/runtime/samples/dynamic-component-bindings-recreated-b/Red.html
index e86ea16182..b83dfe150e 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated-b/Red.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated-b/Red.html
@@ -1,11 +1,5 @@
-<p>red {foo}</p>
-
 <script>
-	export default {
-		data() {
-			return {
-				foo: 'red'
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let foo = 'red';
+</script>
+
+<p>red {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated-b/main.html b/test/runtime/samples/dynamic-component-bindings-recreated-b/main.html
index 41a54e8ee9..cdae60e835 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated-b/main.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated-b/main.html
@@ -1,16 +1,10 @@
-<p>parent {foo}</p>
-<svelte:component this="{x ? Green : Red}" bind:foo />
-
 <script>
 	import Green from './Green.html';
 	import Red from './Red.html';
 
-	export default {
-		data() {
-			return {
-				Green,
-				Red
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let foo;
+	export let x;
+</script>
+
+<p>parent {foo}</p>
+<svelte:component this="{x ? Green : Red}" bind:foo />
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/main.html b/test/runtime/samples/dynamic-component-bindings-recreated/main.html
index a26c1cd080..c91906e5df 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/main.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/main.html
@@ -1,15 +1,9 @@
-<svelte:component this="{x ? Green : Red}" bind:foo />
-
 <script>
 	import Green from './Green.html';
 	import Red from './Red.html';
 
-	export default {
-		data() {
-			return {
-				Green,
-				Red
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+	export let foo;
+</script>
+
+<svelte:component this="{x ? Green : Red}" bind:foo />
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings/main.html b/test/runtime/samples/dynamic-component-bindings/main.html
index 020855cb22..0df350a9f2 100644
--- a/test/runtime/samples/dynamic-component-bindings/main.html
+++ b/test/runtime/samples/dynamic-component-bindings/main.html
@@ -1,12 +1,10 @@
-<svelte:component this="{ x ? Foo : Bar }" bind:y bind:z/>
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+	export let y;
+	export let z;
+</script>
+
+<svelte:component this="{ x ? Foo : Bar }" bind:y bind:z/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-events/Bar.html b/test/runtime/samples/dynamic-component-events/Bar.html
index e6f79984c4..4168bebd91 100644
--- a/test/runtime/samples/dynamic-component-events/Bar.html
+++ b/test/runtime/samples/dynamic-component-events/Bar.html
@@ -1 +1,7 @@
-<button on:click='fire("select", { id: "bar" })'>select bar</button>
\ No newline at end of file
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("select", { id: "bar" })}'>select bar</button>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-events/Foo.html b/test/runtime/samples/dynamic-component-events/Foo.html
index 3601714a55..e5c8fa014b 100644
--- a/test/runtime/samples/dynamic-component-events/Foo.html
+++ b/test/runtime/samples/dynamic-component-events/Foo.html
@@ -1 +1,7 @@
-<button on:click='fire("select", { id: "foo" })'>select foo</button>
\ No newline at end of file
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("select", { id: "foo" })}'>select foo</button>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-events/main.html b/test/runtime/samples/dynamic-component-events/main.html
index 5fa66b2c61..053d2c8099 100644
--- a/test/runtime/samples/dynamic-component-events/main.html
+++ b/test/runtime/samples/dynamic-component-events/main.html
@@ -1,12 +1,9 @@
-<svelte:component this="{ x ? Foo : Bar }" on:select='set({ selected: event.id })'/>
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+	export let selected;
+</script>
+
+<svelte:component this="{ x ? Foo : Bar }" on:select='{event => selected = event.id}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-in-if/main.html b/test/runtime/samples/dynamic-component-in-if/main.html
index 7b5b430ff9..8e4c51068e 100644
--- a/test/runtime/samples/dynamic-component-in-if/main.html
+++ b/test/runtime/samples/dynamic-component-in-if/main.html
@@ -1,18 +1,10 @@
-{#if x}
-	<svelte:component this={x}/>
-{/if}
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		data() {
-			return {
-				x: Foo,
-				Foo,
-				Bar
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let x = Foo;
+</script>
+
+{#if x}
+	<svelte:component this={x}/>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/main.html b/test/runtime/samples/dynamic-component-inside-element/main.html
index 0844346301..2a882c945f 100644
--- a/test/runtime/samples/dynamic-component-inside-element/main.html
+++ b/test/runtime/samples/dynamic-component-inside-element/main.html
@@ -1,14 +1,10 @@
-<div>
-	<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
-</div>
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+</script>
+
+<div>
+	<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-nulled-out/main.html b/test/runtime/samples/dynamic-component-nulled-out/main.html
index 6a1a348557..4b3544f505 100644
--- a/test/runtime/samples/dynamic-component-nulled-out/main.html
+++ b/test/runtime/samples/dynamic-component-nulled-out/main.html
@@ -1,11 +1,5 @@
-<svelte:component this={Foo}/>
-
 <script>
 	import Foo from './Foo.html';
+</script>
 
-	export default {
-		data() {
-			return { Foo };
-		}
-	};
-</script>
\ No newline at end of file
+<svelte:component this={Foo}/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-ref/main.html b/test/runtime/samples/dynamic-component-ref/main.html
index 1d54b17299..f93af2dffb 100644
--- a/test/runtime/samples/dynamic-component-ref/main.html
+++ b/test/runtime/samples/dynamic-component-ref/main.html
@@ -1,11 +1,9 @@
-<svelte:component this={foo} ref:test/>
-
 <script>
+	export let test;
+
 	import Foo from './Foo.html';
 
-	export default {
-		data() {
-			return { foo: Foo };
-		}
-	};
+	export let foo = Foo;
 </script>
+
+<svelte:component this={foo} ref:test/>
diff --git a/test/runtime/samples/dynamic-component-slot/main.html b/test/runtime/samples/dynamic-component-slot/main.html
index e8b5c487ad..32f1ecce19 100644
--- a/test/runtime/samples/dynamic-component-slot/main.html
+++ b/test/runtime/samples/dynamic-component-slot/main.html
@@ -1,3 +1,15 @@
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+	import Baz from './Baz.html';
+
+	export let x;
+	export let tag = 'you\'re it';
+	export let foo;
+	export let bar;
+	export let things = ['a', 'b', 'c'];
+</script>
+
 <svelte:component this="{ x ? Foo : Bar }" x='{x}'>
 	<p>element</p>
 
@@ -20,26 +32,4 @@
 	<Baz/>
 
 	<div slot='other'>what goes up must come down</div>
-</svelte:component>
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-	import Baz from './Baz.html';
-
-	export default {
-		data() {
-			return {
-				Foo,
-				Bar,
-
-				tag: 'you\'re it',
-				things: ['a', 'b', 'c']
-			};
-		},
-
-		components: {
-			Baz
-		}
-	};
-</script>
\ No newline at end of file
+</svelte:component>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/main.html b/test/runtime/samples/dynamic-component-update-existing-instance/main.html
index 1f8bd35f8c..efa9394d30 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/main.html
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/main.html
@@ -1,12 +1,8 @@
-<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+</script>
+
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component/main.html b/test/runtime/samples/dynamic-component/main.html
index 1f8bd35f8c..efa9394d30 100644
--- a/test/runtime/samples/dynamic-component/main.html
+++ b/test/runtime/samples/dynamic-component/main.html
@@ -1,12 +1,8 @@
-<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
-
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
 
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+</script>
+
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-array-literal/main.html b/test/runtime/samples/each-block-array-literal/main.html
index f58a2fa99b..ade8430bcc 100644
--- a/test/runtime/samples/each-block-array-literal/main.html
+++ b/test/runtime/samples/each-block-array-literal/main.html
@@ -1,11 +1,7 @@
-{#each ['racoon', 'eagle'] as animal}
-	<button on:click="set({clicked: animal})">{animal}</button>
-{/each}
-
 <script>
-	export default {
-		data: () => ({
-			clicked: null,
-		}),
-	};
+	export let clicked = null;
 </script>
+
+{#each ['racoon', 'eagle'] as animal}
+	<button on:click="{() => clicked = animal}">{animal}</button>
+{/each}
diff --git a/test/runtime/samples/each-block-containing-component-in-if/main.html b/test/runtime/samples/each-block-containing-component-in-if/main.html
index cf81af277d..16f042a277 100644
--- a/test/runtime/samples/each-block-containing-component-in-if/main.html
+++ b/test/runtime/samples/each-block-containing-component-in-if/main.html
@@ -1,13 +1,10 @@
-<div>
-	<Nested {show} {fields}/>
-</div>
-
 <script>
 	import Nested from './Nested.html';
 
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+	export let show;
+	export let fields;
+</script>
+
+<div>
+	<Nested {show} {fields}/>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-containing-if/main.html b/test/runtime/samples/each-block-containing-if/main.html
index 72fbdc576e..83aaf35c49 100644
--- a/test/runtime/samples/each-block-containing-if/main.html
+++ b/test/runtime/samples/each-block-containing-if/main.html
@@ -1,3 +1,18 @@
+<script>
+	export let items = [
+		{ description: 'one', completed: false },
+		{ description: 'two', completed: false },
+		{ description: 'three', completed: false }
+	];
+	export let currentFilter = 'completed';
+
+	function filter(item, currentFilter) {
+		if ( currentFilter === 'all' ) return true;
+		if ( currentFilter === 'completed' ) return item.completed;
+		if ( currentFilter === 'active' ) return !item.completed;
+	}
+</script>
+
 <ul>
 	{#each items as item}
 		{#if filter(item, currentFilter)}
@@ -5,24 +20,3 @@
 		{/if}
 	{/each}
 </ul>
-
-<script>
-	export default {
-		data: () => ({
-			currentFilter: 'completed',
-			items: [
-				{ description: 'one', completed: false },
-				{ description: 'two', completed: false },
-				{ description: 'three', completed: false }
-			]
-		}),
-
-		helpers: {
-			filter ( item, currentFilter ) {
-				if ( currentFilter === 'all' ) return true;
-				if ( currentFilter === 'completed' ) return item.completed;
-				if ( currentFilter === 'active' ) return !item.completed;
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/each-block-else-mount-or-intro/main.html b/test/runtime/samples/each-block-else-mount-or-intro/main.html
index 4604ecd788..949eb9b096 100644
--- a/test/runtime/samples/each-block-else-mount-or-intro/main.html
+++ b/test/runtime/samples/each-block-else-mount-or-intro/main.html
@@ -1,9 +1,11 @@
+<script>
+	export let items;
+
+	import Widget from './Widget.html';
+</script>
+
 {#each items as item}
 	<Widget {item}/>
 {:else}
 	No items.
 {/each}
-
-<script>
-	export default { components: { Widget: './Widget.html' } };
-</script>
diff --git a/test/runtime/samples/each-block-empty-outro/main.html b/test/runtime/samples/each-block-empty-outro/main.html
index b5d1b95260..325cbbcf45 100644
--- a/test/runtime/samples/each-block-empty-outro/main.html
+++ b/test/runtime/samples/each-block-empty-outro/main.html
@@ -1,3 +1,10 @@
+<script>
+	export let visible;
+	export let empty;
+
+	import Thing from './Thing.html';
+</script>
+
 {#if visible}
 	<div>
 		{#each empty as thing}
@@ -6,12 +13,4 @@
 
 		<p>text</p>
 	</div>
-{/if}
-
-<script>
-	export default {
-		components: {
-			Thing: './Thing.html'
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-keyed-unshift/main.html b/test/runtime/samples/each-block-keyed-unshift/main.html
index 885e12aeb8..5af62d4e08 100644
--- a/test/runtime/samples/each-block-keyed-unshift/main.html
+++ b/test/runtime/samples/each-block-keyed-unshift/main.html
@@ -1,13 +1,9 @@
-{#each titles as title (title.name)}
-	<Nested title="{title.name}"/>
-{/each}
-
 <script>
 	import Nested from './Nested.html';
 
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+	export let titles;
+</script>
+
+{#each titles as title (title.name)}
+	<Nested title="{title.name}"/>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/element-source-location/main.html b/test/runtime/samples/element-source-location/main.html
index 2231e19439..ca70895728 100644
--- a/test/runtime/samples/element-source-location/main.html
+++ b/test/runtime/samples/element-source-location/main.html
@@ -1,10 +1,6 @@
-<h1>this is a header</h1>
-<Foo/>
-
 <script>
-	export default {
-		components: {
-			Foo: './Foo.html'
-		}
-	};
-</script>
\ No newline at end of file
+	import Foo from './Foo.html';
+</script>
+
+<h1>this is a header</h1>
+<Foo/>
\ No newline at end of file
diff --git a/test/runtime/samples/escape-template-literals/main.html b/test/runtime/samples/escape-template-literals/main.html
index 69dca26c65..bfd016de6b 100644
--- a/test/runtime/samples/escape-template-literals/main.html
+++ b/test/runtime/samples/escape-template-literals/main.html
@@ -1,8 +1,7 @@
-<code>`$&#123;foo}\n`</code>
-<div title="`$&#123;foo}\n`">foo</div>
-<Widget value="`$&#123;foo}\n`"/>
-
 <script>
 	import Widget from './Widget.html';
-	export default { components: { Widget } };
 </script>
+
+<code>`$&#123;foo}\n`</code>
+<div title="`$&#123;foo}\n`">foo</div>
+<Widget value="`$&#123;foo}\n`"/>
diff --git a/test/runtime/samples/event-handler-console-log/main.html b/test/runtime/samples/event-handler-console-log/main.html
index 3500b96373..509a4baa34 100644
--- a/test/runtime/samples/event-handler-console-log/main.html
+++ b/test/runtime/samples/event-handler-console-log/main.html
@@ -1 +1 @@
-<button on:click='console.log(foo)'>click me</button>
\ No newline at end of file
+<button on:click='{() => console.log(foo)}'>click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-custom-context/main.html b/test/runtime/samples/event-handler-custom-context/main.html
index dd16947f29..dae4f10807 100644
--- a/test/runtime/samples/event-handler-custom-context/main.html
+++ b/test/runtime/samples/event-handler-custom-context/main.html
@@ -1,28 +1,20 @@
-<button on:tap='set({ z: event.answer })'>{z}</button>
-
 <script>
-	export default {
-		data: () => ({
-			z: '???',
-			answer: '42'
-		}),
+	export let z = '???';
+	export let answer = '42';
 
-		events: {
-			tap ( node, callback ) {
-				const clickHandler = event => {
-					callback({
-						answer: this.get().answer
-					});
-				};
+	function tap(node, callback) {
+		const clickHandler = event => {
+			callback({ answer });
+		};
 
-				node.addEventListener( 'click', clickHandler, false );
+		node.addEventListener( 'click', clickHandler, false );
 
-				return {
-					destroy () {
-						node.addEventListener( 'click', clickHandler, false );
-					}
-				};
+		return {
+			destroy () {
+				node.addEventListener( 'click', clickHandler, false );
 			}
-		}
-	};
+		};
+	}
 </script>
+
+<button on:tap='{event => z = event.answer}'>{z}</button>
diff --git a/test/runtime/samples/event-handler-custom-each-destructured/main.html b/test/runtime/samples/event-handler-custom-each-destructured/main.html
index 3b75c187f4..080f146b6b 100644
--- a/test/runtime/samples/event-handler-custom-each-destructured/main.html
+++ b/test/runtime/samples/event-handler-custom-each-destructured/main.html
@@ -1,36 +1,30 @@
+<script>
+	export let items = [ [0, 'foo'], [1, 'bar'], [2, 'baz'] ];
+	export let first = '';
+	export let second = '';
+	export let x = 0;
+	export let y = 0;
+
+	function tap(node, callback) {
+		function clickHandler ( event ) {
+			callback();
+		}
+
+		node.addEventListener( 'click', clickHandler, false );
+
+		return {
+			destroy () {
+				node.addEventListener( 'click', clickHandler, false );
+			}
+		};
+	}
+</script>
+
 {#each items as [item0, item1]}
-	<button on:tap='set({ first: item0, second: item1 })'>
+	<button on:tap='{() => first = item0, second = item1}'>
 		{item0}: {item1}
 	</button>
 {/each}
 
 <p>first: {first}</p>
 <p>second: {second}</p>
-
-<script>
-	export default {
-		data: () => ({
-			x: 0,
-			y: 0,
-			first: '',
-			second: '',
-			items: [ [0, 'foo'], [1, 'bar'], [2, 'baz'] ]
-		}),
-
-		events: {
-			tap ( node, callback ) {
-				function clickHandler ( event ) {
-					callback();
-				}
-
-				node.addEventListener( 'click', clickHandler, false );
-
-				return {
-					destroy () {
-						node.addEventListener( 'click', clickHandler, false );
-					}
-				};
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/event-handler-custom-each/main.html b/test/runtime/samples/event-handler-custom-each/main.html
index be92ec4d52..c67d3a46d7 100644
--- a/test/runtime/samples/event-handler-custom-each/main.html
+++ b/test/runtime/samples/event-handler-custom-each/main.html
@@ -1,34 +1,28 @@
-{#each items as item}
-	<button on:tap='set({ fromDom: this.textContent, fromState: item })'>{item}</button>
-{/each}
-
-<p>fromDom: {fromDom}</p>
-<p>fromState: {fromState}</p>
-
 <script>
-	export default {
-		data: () => ({
-			x: 0,
-			y: 0,
-			fromDom: '',
-			fromState: '',
-			items: [ 'foo', 'bar', 'baz' ]
-		}),
+	export let items = [ 'foo', 'bar', 'baz' ];
+	export let fromDom = '';
+	export let fromState = '';
+	export let x = 0;
+	export let y = 0;
 
-		events: {
-			tap ( node, callback ) {
-				function clickHandler ( event ) {
-					callback();
-				}
+	function tap(node, callback) {
+		function clickHandler ( event ) {
+			callback();
+		}
 
-				node.addEventListener( 'click', clickHandler, false );
+		node.addEventListener( 'click', clickHandler, false );
 
-				return {
-					destroy () {
-						node.addEventListener( 'click', clickHandler, false );
-					}
-				};
+		return {
+			destroy () {
+				node.addEventListener( 'click', clickHandler, false );
 			}
-		}
-	};
+		};
+	}
 </script>
+
+{#each items as item}
+	<button on:tap='{() => fromDom = this.textContent, fromState = item}'>{item}</button>
+{/each}
+
+<p>fromDom: {fromDom}</p>
+<p>fromState: {fromState}</p>
diff --git a/test/runtime/samples/event-handler-custom-node-context/main.html b/test/runtime/samples/event-handler-custom-node-context/main.html
index 971cda8a8e..452e112c97 100644
--- a/test/runtime/samples/event-handler-custom-node-context/main.html
+++ b/test/runtime/samples/event-handler-custom-node-context/main.html
@@ -1,25 +1,19 @@
-<button on:tap='set({ z: z + 1 })'>{z}</button>
-
 <script>
-	export default {
-		data: () => ({
-			z: 10
-		}),
+	export let z = 10;
 
-		events: {
-			tap ( node, callback ) {
-				const clickHandler = event => {
-					callback(event);
-				};
+	function tap(node, callback) {
+		const clickHandler = event => {
+			callback(event);
+		};
 
-				node.addEventListener( 'click', clickHandler, false );
+		node.addEventListener( 'click', clickHandler, false );
 
-				return {
-					destroy () {
-						node.addEventListener( 'click', clickHandler, false );
-					}
-				};
+		return {
+			destroy () {
+				node.addEventListener( 'click', clickHandler, false );
 			}
-		}
-	};
+		};
+	}
 </script>
+
+<button on:tap='{() => z += 1}'>{z}</button>
diff --git a/test/runtime/samples/event-handler-custom-this/main.html b/test/runtime/samples/event-handler-custom-this/main.html
index 68140628e3..813d63283a 100644
--- a/test/runtime/samples/event-handler-custom-this/main.html
+++ b/test/runtime/samples/event-handler-custom-this/main.html
@@ -1,23 +1,19 @@
-<input on:enter='this.blur()'>
-
 <script>
-	export default {
-		events: {
-			enter(node, callback) {
-				function handleKeydown(event) {
-					if (event.which === 13) {
-						callback();
-					}
-				}
+	function enter(node, callback) {
+		function handleKeydown(event) {
+			if (event.which === 13) {
+				callback();
+			}
+		}
 
-				node.addEventListener('keydown', handleKeydown);
+		node.addEventListener('keydown', handleKeydown);
 
-				return {
-					destroy() {
-						node.removeEventListener('keydown', handleKeydown);
-					}
-				};
+		return {
+			destroy() {
+				node.removeEventListener('keydown', handleKeydown);
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<input on:enter='{() => event.target.blur()}'>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-custom/main.html b/test/runtime/samples/event-handler-custom/main.html
index 53232e9b74..97d216eef0 100644
--- a/test/runtime/samples/event-handler-custom/main.html
+++ b/test/runtime/samples/event-handler-custom/main.html
@@ -1,29 +1,23 @@
-<button on:tap='set({ x: event.x, y: event.y })'>{x}, {y}</button>
-
 <script>
-	export default {
-		data: () => ({
-			x: 0,
-			y: 0
-		}),
+	export let x = 0;
+	export let y = 0;
 
-		events: {
-			tap ( node, callback ) {
-				function clickHandler ( event ) {
-					callback({
-						x: event.clientX,
-						y: event.clientY
-					});
-				}
+	function tap(node, callback) {
+		function clickHandler ( event ) {
+			callback({
+				x: event.clientX,
+				y: event.clientY
+			});
+		}
 
-				node.addEventListener( 'click', clickHandler, false );
+		node.addEventListener( 'click', clickHandler, false );
 
-				return {
-					destroy () {
-						node.addEventListener( 'click', clickHandler, false );
-					}
-				};
+		return {
+			destroy () {
+				node.addEventListener( 'click', clickHandler, false );
 			}
-		}
-	};
+		};
+	}
 </script>
+
+<button on:tap='{event => x = event.x, y = event.y}'>{x}, {y}</button>
diff --git a/test/runtime/samples/event-handler-destroy/_config.js b/test/runtime/samples/event-handler-destroy/_config.js
deleted file mode 100644
index 417f0da041..0000000000
--- a/test/runtime/samples/event-handler-destroy/_config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export default {
-	html: `
-		<button>destroy</button>
-	`,
-
-	test ( assert, component, target, window ) {
-		const button = target.querySelector( 'button' );
-		const event = new window.MouseEvent( 'click' );
-
-		let destroyed = false;
-		component.on( 'destroy', () => {
-			destroyed = true;
-		});
-
-		button.dispatchEvent( event );
-		assert.htmlEqual( target.innerHTML, `` );
-
-		assert.ok( destroyed );
-	}
-};
diff --git a/test/runtime/samples/event-handler-destroy/main.html b/test/runtime/samples/event-handler-destroy/main.html
deleted file mode 100644
index 01b2bb8221..0000000000
--- a/test/runtime/samples/event-handler-destroy/main.html
+++ /dev/null
@@ -1 +0,0 @@
-<button on:click='destroy()'>destroy</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-each-context/main.html b/test/runtime/samples/event-handler-each-context/main.html
index 830bbce47e..3b22ec529c 100644
--- a/test/runtime/samples/event-handler-each-context/main.html
+++ b/test/runtime/samples/event-handler-each-context/main.html
@@ -1,5 +1,5 @@
 {#each items as item}
-	<button on:click='set({ foo: bar })'>{item}</button>
+	<button on:click='{() => foo = bar}'>{item}</button>
 {/each}
 
 <p>foo: {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-each-deconflicted/main.html b/test/runtime/samples/event-handler-each-deconflicted/main.html
index e704a7eac0..165e535e95 100644
--- a/test/runtime/samples/event-handler-each-deconflicted/main.html
+++ b/test/runtime/samples/event-handler-each-deconflicted/main.html
@@ -1,9 +1,9 @@
 {#each foo as f}
-	<button on:click='set({ clicked: "foo" })'>foo</button>
+	<button on:click='{() => clicked = "foo"}'>foo</button>
 {/each}
 
 {#each bar as b}
-	<button on:click='set({ clicked: "bar" })'>bar</button>
+	<button on:click='{() => clicked = "bar"}'>bar</button>
 {/each}
 
 <p>clicked: {clicked}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-each-this/main.html b/test/runtime/samples/event-handler-each-this/main.html
index 9e5ea88a50..d722ffc904 100644
--- a/test/runtime/samples/event-handler-each-this/main.html
+++ b/test/runtime/samples/event-handler-each-this/main.html
@@ -1,3 +1,9 @@
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
 {#each items as item}
-	<button on:click='fire("clicked", { node: this })'>{item}</button>
+	<button on:click='{() => dispatch("clicked", { node: this })}'>{item}</button>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-each/main.html b/test/runtime/samples/event-handler-each/main.html
index bd43d3bec6..3d1c5dcfd8 100644
--- a/test/runtime/samples/event-handler-each/main.html
+++ b/test/runtime/samples/event-handler-each/main.html
@@ -1,5 +1,5 @@
 {#each items as item}
-	<button on:click='set({ selected: item })'>{item}</button>
+	<button on:click='{() => selected = item}'>{item}</button>
 {/each}
 
 <p>selected: {selected}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-event-methods/main.html b/test/runtime/samples/event-handler-event-methods/main.html
index 0aa130e449..ad57976b8a 100644
--- a/test/runtime/samples/event-handler-event-methods/main.html
+++ b/test/runtime/samples/event-handler-event-methods/main.html
@@ -1,18 +1,12 @@
-<div on:click='set({ foo: true })'>
+<script>
+	export let foo = false;
+	export let bar = false;
+</script>
+
+<div on:click='{() => foo = true}'>
 	<button class='allow-propagation'>click me</button>
 </div>
 
-<div on:click='set({ bar: true })'>
-	<button class='stop-propagation' on:click='event.stopPropagation()'>click me</button>
+<div on:click='{() => bar = true}'>
+	<button class='stop-propagation' on:click='{event => event.stopPropagation()}'>click me</button>
 </div>
-
-<script>
-	export default {
-		data () {
-			return {
-				foo: false,
-				bar: false
-			};
-		}
-	};
-</script>
diff --git a/test/runtime/samples/event-handler-hoisted/main.html b/test/runtime/samples/event-handler-hoisted/main.html
index 5e9f8cd71d..fa0012d191 100644
--- a/test/runtime/samples/event-handler-hoisted/main.html
+++ b/test/runtime/samples/event-handler-hoisted/main.html
@@ -1,13 +1,14 @@
-{#each foo as bar}
-	<button on:click='baz(a)'>click me</button>
-{/each}
-
 <script>
-	export default {
-		methods: {
-			baz(a) {
-				this.snapshot = a;
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	export let snapshot;
+
+	export let foo;
+	export let a;
+
+	export function baz(a) {
+		snapshot = a;
+	}
+</script>
+
+{#each foo as bar}
+	<button on:click='{() => baz(a)}'>click me</button>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-removal/main.html b/test/runtime/samples/event-handler-removal/main.html
index 862af691a9..4589640ec6 100644
--- a/test/runtime/samples/event-handler-removal/main.html
+++ b/test/runtime/samples/event-handler-removal/main.html
@@ -1,11 +1,9 @@
-{#if visible}
-	<input ref:input on:blur='set({ blurred: true })'>
-{/if}
-
 <script>
-	export default {
-		data: () => ({
-			visible: true
-		})
-	};
+	export let input;
+	export let blurred = false;
+	export let visible = true;
 </script>
+
+{#if visible}
+	<input ref:input on:blur='{() => blurred = true}'>
+{/if}
diff --git a/test/runtime/samples/event-handler-sanitize/main.html b/test/runtime/samples/event-handler-sanitize/main.html
index 05c80365f2..7a5f39aa58 100644
--- a/test/runtime/samples/event-handler-sanitize/main.html
+++ b/test/runtime/samples/event-handler-sanitize/main.html
@@ -1,4 +1,4 @@
-<div on:some-event='set({ visible: !visible })'>toggle</div>
+<div on:some-event='{() => visible = !visible}'>toggle</div>
 
 {#if visible}
 	<p>hello!</p>
diff --git a/test/runtime/samples/event-handler-shorthand-component/Widget.html b/test/runtime/samples/event-handler-shorthand-component/Widget.html
index 47e1f95a2f..cde03db92b 100644
--- a/test/runtime/samples/event-handler-shorthand-component/Widget.html
+++ b/test/runtime/samples/event-handler-shorthand-component/Widget.html
@@ -1 +1,7 @@
-<button on:click='fire("foo", { answer: 42 })'>click me</button>
\ No newline at end of file
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("foo", { answer: 42 })}'>click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-shorthand-component/main.html b/test/runtime/samples/event-handler-shorthand-component/main.html
index 5eb9bbb3eb..26586d3fd3 100644
--- a/test/runtime/samples/event-handler-shorthand-component/main.html
+++ b/test/runtime/samples/event-handler-shorthand-component/main.html
@@ -1,11 +1,5 @@
-<Widget on:foo/>
-
 <script>
 	import Widget from './Widget.html';
+</script>
 
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
\ No newline at end of file
+<Widget on:foo/>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html b/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html
index 47e1f95a2f..cde03db92b 100644
--- a/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html
+++ b/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html
@@ -1 +1,7 @@
-<button on:click='fire("foo", { answer: 42 })'>click me</button>
\ No newline at end of file
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click='{() => dispatch("foo", { answer: 42 })}'>click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html b/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html
index 388a087608..f38a4d30bb 100644
--- a/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html
+++ b/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html
@@ -1,9 +1,5 @@
-<svelte:component this={Widget} on:foo/>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		data: () => ({ Widget })
-	};
 </script>
+
+<svelte:component this={Widget} on:foo/>
diff --git a/test/runtime/samples/event-handler-shorthand/_config.js b/test/runtime/samples/event-handler-shorthand/_config.js
deleted file mode 100644
index ceded0bf08..0000000000
--- a/test/runtime/samples/event-handler-shorthand/_config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-	html: `
-		<button>click me</button>
-	`,
-
-	test (assert, component, target, window) {
-		const button = target.querySelector('button');
-		const event = new window.MouseEvent('click');
-
-		button.dispatchEvent(event);
-		assert.ok(component.clicked);
-	}
-};
diff --git a/test/runtime/samples/event-handler-shorthand/main.html b/test/runtime/samples/event-handler-shorthand/main.html
deleted file mode 100644
index 5b283cbb59..0000000000
--- a/test/runtime/samples/event-handler-shorthand/main.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<button on:click>click me</button>
-
-<script>
-	export default {
-		oncreate () {
-			this.on('click', () => {
-				this.clicked = true;
-			});
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-this-methods/main.html b/test/runtime/samples/event-handler-this-methods/main.html
index a9f8282c9e..f97c29369d 100644
--- a/test/runtime/samples/event-handler-this-methods/main.html
+++ b/test/runtime/samples/event-handler-this-methods/main.html
@@ -1,2 +1,2 @@
 <input class='wont-focus'>
-<input class='will-focus' on:click='this.focus()'>
+<input class='will-focus' on:click='{() => event.target.focus()}'>
diff --git a/test/runtime/samples/event-handler/main.html b/test/runtime/samples/event-handler/main.html
index 731fe32e75..8dcaf1b701 100644
--- a/test/runtime/samples/event-handler/main.html
+++ b/test/runtime/samples/event-handler/main.html
@@ -1,4 +1,4 @@
-<button on:click='set({ visible: !visible })'>toggle</button>
+<button on:click='{() => visible = !visible}'>toggle</button>
 
 {#if visible}
 	<p>hello!</p>
diff --git a/test/runtime/samples/flush-before-bindings/Nested.html b/test/runtime/samples/flush-before-bindings/Nested.html
index a722863cdd..a632b585a8 100644
--- a/test/runtime/samples/flush-before-bindings/Nested.html
+++ b/test/runtime/samples/flush-before-bindings/Nested.html
@@ -1,30 +1,18 @@
-{#each things as thing}
-	<Visibility bind:isVisible="visibilityMap[thing]">
-		<p>{thing} ({visibilityMap[thing]})</p>
-	</Visibility>
-{/each}
-
 <script>
 	import Visibility from './Visibility.html';
 	import counter from './counter.js';
 
-	export default {
-		data() {
-			return {
-				things: ['first thing', 'second thing'],
-				visibilityMap: {}
-			};
-		},
+	export let things = ['first thing', 'second thing'];
+	export let visibilityMap = {};
 
-		computed: {
-			visibleThings: ({ things, visibilityMap }) => {
-				counter.count += 1;
-				return things.filter(text => visibilityMap[text]);
-			}
-		},
+	function visibleThings() {
+		counter.count += 1;
+		return things.filter(text => visibilityMap[text]);
+	}
+</script>
 
-		components: {
-			Visibility
-		}
-	};
-</script>
\ No newline at end of file
+{#each things as thing}
+	<Visibility bind:isVisible="visibilityMap[thing]">
+		<p>{thing} ({visibilityMap[thing]})</p>
+	</Visibility>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/flush-before-bindings/Visibility.html b/test/runtime/samples/flush-before-bindings/Visibility.html
index 9ecda223f2..98ce02f2b8 100644
--- a/test/runtime/samples/flush-before-bindings/Visibility.html
+++ b/test/runtime/samples/flush-before-bindings/Visibility.html
@@ -1,11 +1,13 @@
+<script>
+	import { onmount } from 'svelte';
+
+	export let isVisible;
+
+	onmount(() => {
+		isVisible = true;
+	});
+</script>
+
 <div>
 	<slot></slot>
 </div>
-
-<script>
-	export default {
-		oncreate() {
-			this.set({ isVisible: true });
-		}
-	};
-</script>
diff --git a/test/runtime/samples/flush-before-bindings/main.html b/test/runtime/samples/flush-before-bindings/main.html
index e95670f85d..a7afa99462 100644
--- a/test/runtime/samples/flush-before-bindings/main.html
+++ b/test/runtime/samples/flush-before-bindings/main.html
@@ -1,28 +1,18 @@
-<Nested bind:visibleThings="visibleThings" />
-
 <script>
+	import { onprops } from 'svelte';
 	import Nested from './Nested.html';
 
-	export default {
-		data() {
-			return {
-				visibleThings: []
-			};
-		},
+	export let snapshots;
+	export let visibleThings = [];
 
-		components: {
-			Nested
-		},
+	onprops(() => {
+		if (!snapshots) {
+			// first run
+			snapshots = [];
+		}
 
-		onstate({ current, changed, previous }) {
-			if (!this.snapshots) {
-				// first run
-				this.snapshots = [];
-			}
+		snapshots.push(visibleThings);
+	});
+</script>
 
-			if (changed.visibleThings) {
-				this.snapshots.push(current.visibleThings);
-			}
-		}
-	};
-</script>
\ No newline at end of file
+<Nested bind:visibleThings="visibleThings" />
\ No newline at end of file
diff --git a/test/runtime/samples/get-state/main.html b/test/runtime/samples/get-state/main.html
index e67adaf72e..1926f65e02 100644
--- a/test/runtime/samples/get-state/main.html
+++ b/test/runtime/samples/get-state/main.html
@@ -1,12 +1,8 @@
 <script>
-	export default {
-		data: () => ({
-			a: 1,
-			b: 2
-		}),
+	export let a = 1;
+	export let b = 2;
 
-		computed: {
-			c: ({ a, b }) => a + b,
-		}
-	};
+	export function c() {
+		return a + b;
+	}
 </script>
diff --git a/test/runtime/samples/globals-shadowed-by-data/main.html b/test/runtime/samples/globals-shadowed-by-data/main.html
index 7e3b408331..4b439b55aa 100644
--- a/test/runtime/samples/globals-shadowed-by-data/main.html
+++ b/test/runtime/samples/globals-shadowed-by-data/main.html
@@ -1,15 +1,10 @@
-{Math.min(x, 5)}
-
 <script>
-	export default {
-		data () {
-			return {
-				Math: {
-					min ( a, b ) {
-						return 'potato';
-					}
-				}
-			};
+	export let x;
+	export let Math = {
+		min ( a, b ) {
+			return 'potato';
 		}
 	};
 </script>
+
+{Math.min(x, 5)}
diff --git a/test/runtime/samples/globals-shadowed-by-helpers/main.html b/test/runtime/samples/globals-shadowed-by-helpers/main.html
index 98b8f19187..8c360f9114 100644
--- a/test/runtime/samples/globals-shadowed-by-helpers/main.html
+++ b/test/runtime/samples/globals-shadowed-by-helpers/main.html
@@ -1,13 +1,11 @@
-{Math.min(x, 5)}
-
 <script>
-	export default {
-		helpers: {
-			Math: {
-				min ( a, b ) {
-					return 'potato';
-				}
-			}
+	export let x;
+
+	const Math = {
+		min ( a, b ) {
+			return 'potato';
 		}
 	};
 </script>
+
+{Math.min(x, 5)}
diff --git a/test/runtime/samples/helpers-not-call-expression/main.html b/test/runtime/samples/helpers-not-call-expression/main.html
index c63838b138..6f69090a58 100644
--- a/test/runtime/samples/helpers-not-call-expression/main.html
+++ b/test/runtime/samples/helpers-not-call-expression/main.html
@@ -1,15 +1,7 @@
-<p>{numbers.map(square)}</p>
-
 <script>
-	export default {
-		data () {
-			return {
-				numbers: [ 1, 2, 3 ]
-			};
-		},
+	export let numbers = [ 1, 2, 3 ];
 
-		helpers: {
-			square: num => num * num
-		}
-	};
+	const square = num => num * num;
 </script>
+
+<p>{numbers.map(square)}</p>
diff --git a/test/runtime/samples/helpers/main.html b/test/runtime/samples/helpers/main.html
index 497a1d119e..c62e3a8fba 100644
--- a/test/runtime/samples/helpers/main.html
+++ b/test/runtime/samples/helpers/main.html
@@ -1,14 +1,10 @@
-<p>{reverse('backwards')}</p>
-
 <script>
-	export default {
-		helpers: {
-			reverse ( str ) {
-				let reversed = '';
-				let i = str.length;
-				while ( i-- ) reversed += str[i];
-				return reversed;
-			}
-		}
-	};
+	function reverse(str) {
+		let reversed = '';
+		let i = str.length;
+		while ( i-- ) reversed += str[i];
+		return reversed;
+	}
 </script>
+
+<p>{reverse('backwards')}</p>
diff --git a/test/runtime/samples/if-block-component-without-outro/main.html b/test/runtime/samples/if-block-component-without-outro/main.html
index f043b3644a..45498b97a1 100644
--- a/test/runtime/samples/if-block-component-without-outro/main.html
+++ b/test/runtime/samples/if-block-component-without-outro/main.html
@@ -1,11 +1,9 @@
+<script>
+	export let foo;
+
+	import Widget from './Widget.html';
+</script>
+
 {#if foo}
 	<Widget/>
-{/if}
-
-<script>
-	export default {
-		components: {
-			Widget: './Widget.html'
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/if-block-else-partial-outro/main.html b/test/runtime/samples/if-block-else-partial-outro/main.html
index 9cb4408b73..90c253c730 100644
--- a/test/runtime/samples/if-block-else-partial-outro/main.html
+++ b/test/runtime/samples/if-block-else-partial-outro/main.html
@@ -1,20 +1,12 @@
+<script>
+	export let y = false;
+	export let x = 'x';
+
+	import Foo from './Foo.html';
+</script>
+
 {#if y}
 	<Foo/>
 {:else}
 	<span>{x}</span>
-{/if}
-
-<script>
-	export default {
-		components: {
-			Foo: './Foo.html'
-		},
-
-		data() {
-			return {
-				x: 'x',
-				y: false
-			};
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/if-block-no-outro-else-with-outro/main.html b/test/runtime/samples/if-block-no-outro-else-with-outro/main.html
index 5789f2386e..d881addce0 100644
--- a/test/runtime/samples/if-block-no-outro-else-with-outro/main.html
+++ b/test/runtime/samples/if-block-no-outro-else-with-outro/main.html
@@ -1,21 +1,14 @@
+<script>
+	export let foo;
+	export let x = 'x';
+
+	import Widget from './Widget.html';
+</script>
+
 {#if foo}
 	<p>foo</p>
 {:else}
 	<Widget/>
 	<p>{x}</p>
 	<input type="text" bind:value=x />
-{/if}
-
-<script>
-	export default {
-		components: {
-			Widget: './Widget.html'
-		},
-
-		data() {
-			return {
-				x: 'x'
-			};
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/if-block-outro-nested-else/main.html b/test/runtime/samples/if-block-outro-nested-else/main.html
index 02e000b3c3..c10f861a6c 100644
--- a/test/runtime/samples/if-block-outro-nested-else/main.html
+++ b/test/runtime/samples/if-block-outro-nested-else/main.html
@@ -1,3 +1,9 @@
+<script>
+	export let foo = true;
+
+	import Component from './Component.html';
+</script>
+
 {#if foo}
 	{#if false}
 		<Component/>
@@ -5,12 +11,3 @@
 		<Component/>
 	{/if}
 {/if}
-
-<script>
-	export default {
-		components: {
-			Component: './Component.html',
-		},
-		data: () => ({ foo: true }),
-	}
-</script>
diff --git a/test/runtime/samples/if-block-outro-unique-select-block-type/main.html b/test/runtime/samples/if-block-outro-unique-select-block-type/main.html
index a27aba9d77..77b3a6dfe3 100644
--- a/test/runtime/samples/if-block-outro-unique-select-block-type/main.html
+++ b/test/runtime/samples/if-block-outro-unique-select-block-type/main.html
@@ -1,3 +1,9 @@
+<script>
+	export let foo = true;
+
+	import Component from './Component.html';
+</script>
+
 {#if foo}
 	<Component/>
 {:else}
@@ -9,12 +15,3 @@
 {:else}
 	<div></div>
 {/if}
-
-<script>
-	export default {
-		components: {
-			Component: './Component.html',
-		},
-		data: () => ({ foo: true }),
-	}
-</script>
diff --git a/test/runtime/samples/if-block-widget/main.html b/test/runtime/samples/if-block-widget/main.html
index cd73d020a6..12996bbcd4 100644
--- a/test/runtime/samples/if-block-widget/main.html
+++ b/test/runtime/samples/if-block-widget/main.html
@@ -1,14 +1,11 @@
+<script>
+	import Widget from './Widget.html';
+
+	export let visible;
+</script>
+
 before
 {#if visible}
 	<Widget />
 {/if}
 after
-<script>
-	import Widget from './Widget.html';
-
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
diff --git a/test/runtime/samples/ignore-unchanged-attribute-compound/main.html b/test/runtime/samples/ignore-unchanged-attribute-compound/main.html
index a99f94147e..08dcebbbd3 100644
--- a/test/runtime/samples/ignore-unchanged-attribute-compound/main.html
+++ b/test/runtime/samples/ignore-unchanged-attribute-compound/main.html
@@ -1,15 +1,14 @@
-<p>{x}</p>
-<p class='-{myHelper(y)}-'></p>
-
 <script>
 	import counter from './counter.js';
 
-	export default {
-		helpers: {
-			myHelper(value) {
-				counter.count += 1;
-				return value;
-			}
-		}
-	};
+	export let x;
+	export let y;
+
+	function myHelper(value) {
+		counter.count += 1;
+		return value;
+	}
 </script>
+
+<p>{x}</p>
+<p class='-{myHelper(y)}-'></p>
diff --git a/test/runtime/samples/ignore-unchanged-attribute/main.html b/test/runtime/samples/ignore-unchanged-attribute/main.html
index 463e21735d..5f657cb6b3 100644
--- a/test/runtime/samples/ignore-unchanged-attribute/main.html
+++ b/test/runtime/samples/ignore-unchanged-attribute/main.html
@@ -1,15 +1,14 @@
-<p>{x}</p>
-<p class='{myHelper(y)}'></p>
-
 <script>
 	import counter from './counter.js';
 
-	export default {
-		helpers: {
-			myHelper(value) {
-				counter.count += 1;
-				return value;
-			}
-		}
-	};
+	export let x;
+	export let y;
+
+	function myHelper(value) {
+		counter.count += 1;
+		return value;
+	}
 </script>
+
+<p>{x}</p>
+<p class='{myHelper(y)}'></p>
diff --git a/test/runtime/samples/ignore-unchanged-raw/main.html b/test/runtime/samples/ignore-unchanged-raw/main.html
index c28e7b537e..ed2e3b2b5f 100644
--- a/test/runtime/samples/ignore-unchanged-raw/main.html
+++ b/test/runtime/samples/ignore-unchanged-raw/main.html
@@ -1,15 +1,14 @@
-<p>{x}</p>
-<p>{@html myHelper(y)}</p>
-
 <script>
 	import counter from './counter.js';
 
-	export default {
-		helpers: {
-			myHelper(value) {
-				counter.count += 1;
-				return value;
-			}
-		}
-	};
+	export let x;
+	export let y;
+
+	function myHelper(value) {
+		counter.count += 1;
+		return value;
+	}
 </script>
+
+<p>{x}</p>
+<p>{@html myHelper(y)}</p>
diff --git a/test/runtime/samples/ignore-unchanged-tag/main.html b/test/runtime/samples/ignore-unchanged-tag/main.html
index e2a7899122..6c748f5643 100644
--- a/test/runtime/samples/ignore-unchanged-tag/main.html
+++ b/test/runtime/samples/ignore-unchanged-tag/main.html
@@ -1,15 +1,14 @@
-<p>{x}</p>
-<p>{myHelper(y)}</p>
-
 <script>
 	import counter from './counter.js';
 
-	export default {
-		helpers: {
-			myHelper(value) {
-				counter.count += 1;
-				return value;
-			}
-		}
-	};
+	export let x;
+	export let y;
+
+	function myHelper(value) {
+		counter.count += 1;
+		return value;
+	}
 </script>
+
+<p>{x}</p>
+<p>{myHelper(y)}</p>
diff --git a/test/runtime/samples/immutable-mutable/Nested.html b/test/runtime/samples/immutable-mutable/Nested.html
index 1d623779eb..b68af94b89 100644
--- a/test/runtime/samples/immutable-mutable/Nested.html
+++ b/test/runtime/samples/immutable-mutable/Nested.html
@@ -1,13 +1,6 @@
-<h3>Called {count} times.</h3>
-
 <script>
-	export default {
-		immutable: false,
-		data() {
-			return {
-				count: 0,
-				foo: { bar: 'baz' }
-			};
-		}
-	}
-</script>
\ No newline at end of file
+	export let count = 0;
+	export let foo = { bar: 'baz' };
+</script>
+
+<h3>Called {count} times.</h3>
\ No newline at end of file
diff --git a/test/runtime/samples/immutable-mutable/main.html b/test/runtime/samples/immutable-mutable/main.html
index 4e36143361..f036cbdfc3 100644
--- a/test/runtime/samples/immutable-mutable/main.html
+++ b/test/runtime/samples/immutable-mutable/main.html
@@ -1,13 +1,9 @@
-<div>
-  <Nested ref:nested />
-</div>
-
 <script>
-	import Nested from './Nested.html';
+	export let nested;
 
-	export default {
-		components: {
-			Nested
-		}
-	};
+	import Nested from './Nested.html';
 </script>
+
+<div>
+  <Nested ref:nested />
+</div>
diff --git a/test/runtime/samples/immutable-nested/Nested.html b/test/runtime/samples/immutable-nested/Nested.html
index 1f3d808d63..b68af94b89 100644
--- a/test/runtime/samples/immutable-nested/Nested.html
+++ b/test/runtime/samples/immutable-nested/Nested.html
@@ -1,12 +1,6 @@
-<h3>Called {count} times.</h3>
-
 <script>
-	export default {
-		data() {
-			return {
-				count: 0,
-				foo: { bar: 'baz' }
-			};
-		}
-	}
-</script>
\ No newline at end of file
+	export let count = 0;
+	export let foo = { bar: 'baz' };
+</script>
+
+<h3>Called {count} times.</h3>
\ No newline at end of file
diff --git a/test/runtime/samples/immutable-nested/main.html b/test/runtime/samples/immutable-nested/main.html
index 4e36143361..f036cbdfc3 100644
--- a/test/runtime/samples/immutable-nested/main.html
+++ b/test/runtime/samples/immutable-nested/main.html
@@ -1,13 +1,9 @@
-<div>
-  <Nested ref:nested />
-</div>
-
 <script>
-	import Nested from './Nested.html';
+	export let nested;
 
-	export default {
-		components: {
-			Nested
-		}
-	};
+	import Nested from './Nested.html';
 </script>
+
+<div>
+  <Nested ref:nested />
+</div>
diff --git a/test/runtime/samples/immutable-root/main.html b/test/runtime/samples/immutable-root/main.html
index b54f41743c..85c31ae989 100644
--- a/test/runtime/samples/immutable-root/main.html
+++ b/test/runtime/samples/immutable-root/main.html
@@ -1,14 +1,8 @@
+<script>
+	export let count = 0;
+	export let foo = { bar: 'baz' };
+</script>
+
 <div>
 	<h3>Called {count} times.</h3>
-</div>
-
-<script>
-  export default {
-		data() {
-			return {
-				count: 0,
-				foo: { bar: 'baz' }
-			};
-		}
-  }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/imported-renamed-components/main.html b/test/runtime/samples/imported-renamed-components/main.html
index a976830378..9c6efdb230 100644
--- a/test/runtime/samples/imported-renamed-components/main.html
+++ b/test/runtime/samples/imported-renamed-components/main.html
@@ -1,10 +1,9 @@
-<RenamedComponentOne/><RenamedComponentTwo/>
-
 <script>
 	import ComponentOne from './ComponentOne.html';
 	import ComponentTwo from './ComponentTwo.html';
 
-	export default {
-		components: { RenamedComponentOne: ComponentOne, RenamedComponentTwo: ComponentTwo },
-	};
+	const RenamedComponentOne = ComponentOne;
+	const RenamedComponentTwo = ComponentTwo;
 </script>
+
+<RenamedComponentOne/><RenamedComponentTwo/>
diff --git a/test/runtime/samples/initial-state-assign/main.html b/test/runtime/samples/initial-state-assign/main.html
index be3a613784..258b12fec9 100644
--- a/test/runtime/samples/initial-state-assign/main.html
+++ b/test/runtime/samples/initial-state-assign/main.html
@@ -1,10 +1,7 @@
-{JSON.stringify(foo)}
-{JSON.stringify(bar)}
-
 <script>
-	export default {
-		data() {
-			return { foo: 'foo' };
-		}
-	};
+	export let foo = 'foo';
+	export let bar;
 </script>
+
+{JSON.stringify(foo)}
+{JSON.stringify(bar)}
diff --git a/test/runtime/samples/lifecycle-events/main.html b/test/runtime/samples/lifecycle-events/main.html
index b39ce292d6..075aa7762d 100644
--- a/test/runtime/samples/lifecycle-events/main.html
+++ b/test/runtime/samples/lifecycle-events/main.html
@@ -1,13 +1,15 @@
-<div></div>
-
 <script>
-	export default {
-		oncreate() {
-			this.events = ['create'];
-		},
-
-		ondestroy() {
-			this.events.push('destroy');
-		}
-	};
-</script>
\ No newline at end of file
+	import { ondestroy, onmount } from 'svelte';
+
+	export let events;
+
+	onmount(() => {
+		events = ['create'];
+	});
+
+	ondestroy(() => {
+		events.push('destroy');
+	});
+</script>
+
+<div></div>
\ No newline at end of file
diff --git a/test/runtime/samples/names-deconflicted/main.html b/test/runtime/samples/names-deconflicted/main.html
index 282c438267..f2c47a7718 100644
--- a/test/runtime/samples/names-deconflicted/main.html
+++ b/test/runtime/samples/names-deconflicted/main.html
@@ -1,21 +1,13 @@
-{#each widgets as widget, i}
-	<Widget widget='{widget}' index='{i}'/>
-{/each}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data () {
-			return {
-				widgets: [
-					{ name: 'foo' },
-					{ name: 'bar' },
-					{ name: 'baz' }
-				]
-			};
-		},
-
-		components: { Widget }
-	};
+	export let widgets = [
+		{ name: 'foo' },
+		{ name: 'bar' },
+		{ name: 'baz' }
+	];
 </script>
+
+{#each widgets as widget, i}
+	<Widget widget='{widget}' index='{i}'/>
+{/each}
diff --git a/test/runtime/samples/nested-transition-detach-each/main.html b/test/runtime/samples/nested-transition-detach-each/main.html
index c81fc3eb78..6f04d3fb6f 100644
--- a/test/runtime/samples/nested-transition-detach-each/main.html
+++ b/test/runtime/samples/nested-transition-detach-each/main.html
@@ -1,3 +1,16 @@
+<script>
+	export let visible;
+	export let rows;
+	export let cols;
+
+	function foo(node) {
+		return {
+			duration: 100,
+			tick: t => node.foo = t
+		};
+	}
+</script>
+
 {#if visible}
 	{#each rows as row}
 		<div out:foo class="row">
@@ -6,17 +19,4 @@
 			{/each}
 		</div>
 	{/each}
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node) {
-				return {
-					duration: 100,
-					tick: t => node.foo = t
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/nested-transition-detach-if-false/Folder.html b/test/runtime/samples/nested-transition-detach-if-false/Folder.html
index cd3448a3f2..f0acf1533e 100644
--- a/test/runtime/samples/nested-transition-detach-if-false/Folder.html
+++ b/test/runtime/samples/nested-transition-detach-if-false/Folder.html
@@ -1,3 +1,25 @@
+<script>
+	export let dir;
+	export let open = true;
+	export let items = [];
+
+	function items() {
+		return dir === 'a'
+			? [
+				{
+					filename: 'a/b',
+					isDir: true
+				}
+			]
+			: [
+				{
+					filename: 'a/b/c',
+					isDir: false
+				}
+			];
+	}
+</script>
+
 <li>
 	<span>{dir}</span>
 
@@ -12,33 +34,4 @@
 			{/each}
 		</ul>
 	{/if}
-</li>
-
-<script>
-	export default {
-		data() {
-			return {
-				items: [],
-				open: true
-			};
-		},
-
-		computed: {
-			items: ({ dir }) => {
-				return dir === 'a'
-					? [
-						{
-							filename: 'a/b',
-							isDir: true
-						}
-					]
-					: [
-						{
-							filename: 'a/b/c',
-							isDir: false
-						}
-					];
-			}
-		}
-	};
-</script>
\ No newline at end of file
+</li>
\ No newline at end of file
diff --git a/test/runtime/samples/nested-transition-detach-if-false/main.html b/test/runtime/samples/nested-transition-detach-if-false/main.html
index cf14773c9c..41429fca38 100644
--- a/test/runtime/samples/nested-transition-detach-if-false/main.html
+++ b/test/runtime/samples/nested-transition-detach-if-false/main.html
@@ -1,9 +1,7 @@
-<Folder ref:folder dir="a"/>
-
 <script>
-	export default {
-		components: {
-			Folder: './Folder.html'
-		}
-	};
-</script>
\ No newline at end of file
+	export let folder;
+
+	import Folder from './Folder.html';
+</script>
+
+<Folder ref:folder dir="a"/>
\ No newline at end of file
diff --git a/test/runtime/samples/nested-transition-if-block-not-remounted/main.html b/test/runtime/samples/nested-transition-if-block-not-remounted/main.html
index ad8b2454a8..373d3d0485 100644
--- a/test/runtime/samples/nested-transition-if-block-not-remounted/main.html
+++ b/test/runtime/samples/nested-transition-if-block-not-remounted/main.html
@@ -1,14 +1,12 @@
+<script>
+	export let x;
+
+	import Span from './Span.html';
+</script>
+
 <div>
 	{#if x}
-		<input on:input="set({ value: this.value })">
+		<input on:input="{() => value = this.value}">
 		<Span>x</Span>
 	{/if}
-</div>
-
-<script>
-	export default {
-		components: {
-			Span: './Span.html'
-		}
-	};
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/object-rest/_config.js b/test/runtime/samples/object-rest/_config.js
deleted file mode 100644
index 7a60f0d563..0000000000
--- a/test/runtime/samples/object-rest/_config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export default {
-	skip: +/v(\d+)/.exec(process.version)[1] < 8,
-
-	html: `
-		<pre>{"wanted":2}</pre>
-	`,
-
-	test(assert, component, target) {
-		component.set({
-			unwanted: 3,
-			wanted: 4
-		});
-
- 		assert.htmlEqual(target.innerHTML, `
-			<pre>{"wanted":4}</pre>
-		`);
-
- 		component.set({
-			unwanted: 5,
-			wanted: 6
-		});
-
- 		assert.htmlEqual(target.innerHTML, `
-			<pre>{"wanted":6}</pre>
-		`);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/object-rest/main.html b/test/runtime/samples/object-rest/main.html
deleted file mode 100644
index e66a89291e..0000000000
--- a/test/runtime/samples/object-rest/main.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<pre>{JSON.stringify(props)}</pre>
-<script>
-	export default {
-		data: () => ({
-			unwanted: 1,
-			wanted: 2
-		}),
-
-		helpers: {
-			// prevent this being mixed in with data
-			JSON
-		},
-
-		computed: {
-			props: ({ unwanted, ...x }) => x
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/observe-binding-ignores-unchanged/main.html b/test/runtime/samples/observe-binding-ignores-unchanged/main.html
index 2492f1830e..0ef65dd4b5 100644
--- a/test/runtime/samples/observe-binding-ignores-unchanged/main.html
+++ b/test/runtime/samples/observe-binding-ignores-unchanged/main.html
@@ -1,21 +1,14 @@
-<Nested ref:nested bind:field1="myObject.field1" bind:field2="myObject.field2" />
-<p>field1: {myObject.field1}</p>
-<p>field2: {myObject.field2}</p>
-
 <script>
+	export let nested;
+
 	import Nested from './Nested.html';
 
-	export default {
-		components: {
-			Nested
-		},
-		data() {
-			return {
-				myObject: {
-					field1: 1,
-					field2: 2
-				}
-			};
-		}
+	export let myObject = {
+		field1: 1,
+		field2: 2
 	};
-</script>
\ No newline at end of file
+</script>
+
+<Nested ref:nested bind:field1="myObject.field1" bind:field2="myObject.field2" />
+<p>field1: {myObject.field1}</p>
+<p>field2: {myObject.field2}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
index 2063d8c1b0..4f04a14b89 100644
--- a/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
+++ b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
@@ -1,14 +1,10 @@
-<Foo ref:foo x='{x}'/>
-
 <script>
-	import Foo from './Foo.html';
+	export let foo;
 
-	export default {
-		data: () => ({
-			x: {},
-			y: {}
-		}),
+	import Foo from './Foo.html';
 
-		components: { Foo }
-	};
+	export let x = {};
+	export let y = {};
 </script>
+
+<Foo ref:foo x='{x}'/>
diff --git a/test/runtime/samples/observe-deferred/main.html b/test/runtime/samples/observe-deferred/main.html
index 9765e91159..ab80973fb2 100644
--- a/test/runtime/samples/observe-deferred/main.html
+++ b/test/runtime/samples/observe-deferred/main.html
@@ -1,14 +1,15 @@
-<p ref:a>{value}</p>
-<p ref:b></p>
-
 <script>
-	export default {
-		oncreate() {
-			this.on('update', ({ changed }) => {
-				if (changed.value) {
-					this.refs.b.textContent = this.refs.a.textContent;
-				}
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	import { onupdate } from 'svelte';
+
+	export let a;
+	export let b;
+
+	export let value;
+
+	onupdate(() => {
+		b.textContent = a.textContent;
+	});
+</script>
+
+<p ref:a>{value}</p>
+<p ref:b></p>
\ No newline at end of file
diff --git a/test/runtime/samples/oncreate-async-arrow-block/main.html b/test/runtime/samples/oncreate-async-arrow-block/main.html
index 6a3f4c48f1..4b075b09a4 100644
--- a/test/runtime/samples/oncreate-async-arrow-block/main.html
+++ b/test/runtime/samples/oncreate-async-arrow-block/main.html
@@ -1,7 +1,7 @@
 <script>
-	export default {
-		oncreate: async () => {
-			await 123
-		}
-	};
+	import { onmount } from 'svelte';
+
+	onmount(async () => {
+		await 123
+	});
 </script>
diff --git a/test/runtime/samples/oncreate-async-arrow/main.html b/test/runtime/samples/oncreate-async-arrow/main.html
index b37145dd17..67ec75056a 100644
--- a/test/runtime/samples/oncreate-async-arrow/main.html
+++ b/test/runtime/samples/oncreate-async-arrow/main.html
@@ -1,5 +1,5 @@
 <script>
-	export default {
-		oncreate: async () => await 123
-	};
+	import { onmount } from 'svelte';
+
+	onmount(async () => await 123);
 </script>
diff --git a/test/runtime/samples/oncreate-async/main.html b/test/runtime/samples/oncreate-async/main.html
index b8b74050b2..4b075b09a4 100644
--- a/test/runtime/samples/oncreate-async/main.html
+++ b/test/runtime/samples/oncreate-async/main.html
@@ -1,7 +1,7 @@
 <script>
-	export default {
-		async oncreate() {
-			await 123
-		}
-	};
+	import { onmount } from 'svelte';
+
+	onmount(async () => {
+		await 123
+	});
 </script>
diff --git a/test/runtime/samples/oncreate-sibling-order/Nested.html b/test/runtime/samples/oncreate-sibling-order/Nested.html
index 6bf82772a0..958be20e68 100644
--- a/test/runtime/samples/oncreate-sibling-order/Nested.html
+++ b/test/runtime/samples/oncreate-sibling-order/Nested.html
@@ -1,11 +1,13 @@
-<p>{name}</p>
-
 <script>
+	import { onmount } from 'svelte';
+
 	import result from './result.js';
 
-	export default {
-		oncreate() {
-			result.push(`oncreate ${this.get().name}`);
-		}
-	};
-</script>
\ No newline at end of file
+	export let name;
+
+	onmount(() => {
+		result.push(`oncreate ${name}`);
+	});
+</script>
+
+<p>{name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/oncreate-sibling-order/main.html b/test/runtime/samples/oncreate-sibling-order/main.html
index ba594477f0..e4218aa4b4 100644
--- a/test/runtime/samples/oncreate-sibling-order/main.html
+++ b/test/runtime/samples/oncreate-sibling-order/main.html
@@ -1,12 +1,6 @@
-<Nested name='foo'/>
-<Nested name='bar'/>
-
 <script>
 	import Nested from './Nested.html';
+</script>
 
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
\ No newline at end of file
+<Nested name='foo'/>
+<Nested name='bar'/>
\ No newline at end of file
diff --git a/test/runtime/samples/ondestroy-before-cleanup/Top.html b/test/runtime/samples/ondestroy-before-cleanup/Top.html
index 1e936b48fd..1133a6eacf 100644
--- a/test/runtime/samples/ondestroy-before-cleanup/Top.html
+++ b/test/runtime/samples/ondestroy-before-cleanup/Top.html
@@ -1,9 +1,12 @@
-<div ref:element></div>
-
 <script>
-	export default {
-		ondestroy() {
-			this.refOnDestroy = this.refs.element;
-		}
-	};
+	import { ondestroy } from 'svelte';
+
+	export let element;
+	export let refOnDestroy;
+
+	ondestroy(() => {
+		refOnDestroy = element;
+	});
 </script>
+
+<div ref:element></div>
diff --git a/test/runtime/samples/ondestroy-before-cleanup/main.html b/test/runtime/samples/ondestroy-before-cleanup/main.html
index cce0356f6a..e7758c98f6 100644
--- a/test/runtime/samples/ondestroy-before-cleanup/main.html
+++ b/test/runtime/samples/ondestroy-before-cleanup/main.html
@@ -1,18 +1,11 @@
-{#if visible}
-	<Top ref:top></Top>
-{/if}
-
 <script>
+	export let top;
+
 	import Top from './Top.html';
 	
-	export default {
-		data() {
-			return {
-				visible: true
-			};
-		},
-		components: {
-			Top
-		}
-	};
-</script>
\ No newline at end of file
+	export let visible = true;
+</script>
+
+{#if visible}
+	<Top ref:top></Top>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/onrender-chain/Item.html b/test/runtime/samples/onrender-chain/Item.html
index ca0f489b57..34ccd9c33e 100644
--- a/test/runtime/samples/onrender-chain/Item.html
+++ b/test/runtime/samples/onrender-chain/Item.html
@@ -1,14 +1,12 @@
-<span>{foo}</span>
-
 <script>
-	export default {
-		data() {
-			return {
-				foo: 'XX'
-			};
-		},
-		onstate({ changed, current }) {
-			this.set({ foo: current.item });
-		}
-	};
-</script>
\ No newline at end of file
+	import { onprops } from 'svelte';
+
+	export let item;
+	export let foo = 'XX';
+
+	onprops(() => {
+		foo = item;
+	});
+</script>
+
+<span>{foo}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/onrender-chain/List.html b/test/runtime/samples/onrender-chain/List.html
index 513c62b2e6..f57c179973 100644
--- a/test/runtime/samples/onrender-chain/List.html
+++ b/test/runtime/samples/onrender-chain/List.html
@@ -1,25 +1,13 @@
-{#each items as item}
-	<Item item={item} />
-{/each}
-
 <script>
 	import Item from './Item.html';
 
-	export default {
-		data () {
-			return {
-				items: [ 3, 2, 1 ]
-			};
-		},
-		methods: {
-			update () {
-				this.set({
-					items: [ 1, 2, 3, 4, 5 ]
-				});
-			}
-		},
-		components: {
-			Item
-		}
-	};
+	export let items = [ 3, 2, 1 ];
+
+	export function update() {
+		items = [ 1, 2, 3, 4, 5 ];
+	}
 </script>
+
+{#each items as item}
+	<Item item={item} />
+{/each}
diff --git a/test/runtime/samples/onrender-chain/main.html b/test/runtime/samples/onrender-chain/main.html
index 90dc4c94d9..8156f7e8a5 100644
--- a/test/runtime/samples/onrender-chain/main.html
+++ b/test/runtime/samples/onrender-chain/main.html
@@ -1,11 +1,7 @@
-<List ref:list/>
-
 <script>
-	import List from './List.html';
+	export let list;
 
-	export default {
-		components: {
-			List
-		}
-	};
+	import List from './List.html';
 </script>
+
+<List ref:list/>
diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html b/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
index 5774edea19..e1dc10c773 100644
--- a/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
+++ b/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
@@ -1,11 +1,7 @@
-<Widget/>{#if foo}<Widget/>{/if}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: {
-			Widget
-		}
-	};
+	export let foo;
 </script>
+
+<Widget/>{#if foo}<Widget/>{/if}
diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html b/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
index 4bbcb98f33..b6cb8c8a55 100644
--- a/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
+++ b/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
@@ -1,9 +1,13 @@
-<p ref:x>{inDocument}</p>
-
 <script>
-	export default {
-		oncreate () {
-			this.set({ inDocument: document.contains( this.refs.x ) })
-		}
-	};
+	import { onmount } from 'svelte';
+
+	export let x;
+
+	export let inDocument;
+
+	onmount(() => {
+		inDocument = document.contains(x);
+	});
 </script>
+
+<p ref:x>{inDocument}</p>
diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/main.html b/test/runtime/samples/onrender-fires-when-ready-nested/main.html
index 6ba25d0a68..910f63e086 100644
--- a/test/runtime/samples/onrender-fires-when-ready-nested/main.html
+++ b/test/runtime/samples/onrender-fires-when-ready-nested/main.html
@@ -1,16 +1,9 @@
-<div>
-	<Widget/>
-	<ParentWidget />
-</div>
-
 <script>
 	import Widget from './Widget.html';
 	import ParentWidget from './ParentWidget.html';
-
-	export default {
-		components: {
-			Widget,
-			ParentWidget
-		}
-	};
 </script>
+
+<div>
+	<Widget/>
+	<ParentWidget />
+</div>
diff --git a/test/runtime/samples/onrender-fires-when-ready/Widget.html b/test/runtime/samples/onrender-fires-when-ready/Widget.html
index 4bbcb98f33..b6cb8c8a55 100644
--- a/test/runtime/samples/onrender-fires-when-ready/Widget.html
+++ b/test/runtime/samples/onrender-fires-when-ready/Widget.html
@@ -1,9 +1,13 @@
-<p ref:x>{inDocument}</p>
-
 <script>
-	export default {
-		oncreate () {
-			this.set({ inDocument: document.contains( this.refs.x ) })
-		}
-	};
+	import { onmount } from 'svelte';
+
+	export let x;
+
+	export let inDocument;
+
+	onmount(() => {
+		inDocument = document.contains(x);
+	});
 </script>
+
+<p ref:x>{inDocument}</p>
diff --git a/test/runtime/samples/onrender-fires-when-ready/main.html b/test/runtime/samples/onrender-fires-when-ready/main.html
index 49bfc412d0..f2760ecff1 100644
--- a/test/runtime/samples/onrender-fires-when-ready/main.html
+++ b/test/runtime/samples/onrender-fires-when-ready/main.html
@@ -1,3 +1,9 @@
+<script>
+	import Widget from './Widget.html';
+
+	export let foo;
+</script>
+
 <div>
 	<Widget/>
 
@@ -5,13 +11,3 @@
 		<Widget/>
 	{/if}
 </div>
-
-<script>
-	import Widget from './Widget.html';
-
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
diff --git a/test/runtime/samples/onstate-before-oncreate/main.html b/test/runtime/samples/onstate-before-oncreate/main.html
index 9d4aa980ea..657cab43d1 100644
--- a/test/runtime/samples/onstate-before-oncreate/main.html
+++ b/test/runtime/samples/onstate-before-oncreate/main.html
@@ -1,16 +1,21 @@
 <script>
-	export default {
-		onstate() {
-			this.onstateRan = true;
-		},
+	import { onmount, onprops, onupdate } from 'svelte';
 
-		onupdate() {
-			this.onupdateRan = true;
-		},
+	export let onstateRanBeforeOncreate;
+	export let onupdateRanBeforeOncreate;
+	let onpropsRan;
+	let onupdateRan;
 
-		oncreate() {
-			this.onstateRanBeforeOncreate = this.onstateRan;
-			this.onupdateRanBeforeOncreate = this.onupdateRan;
-		}
-	};
+	onprops(() => {
+		onstateRan = true;
+	});
+
+	onupdate(() => {
+		onupdateRan = true;
+	});
+
+	onmount(() => {
+		onpropsRanBeforeOncreate = onpropsRan;
+		onupdateRanBeforeOncreate = onupdateRan;
+	});
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/onstate-before-render/_config.js b/test/runtime/samples/onstate-before-render/_config.js
index 97c3af5083..bbb425c95a 100644
--- a/test/runtime/samples/onstate-before-render/_config.js
+++ b/test/runtime/samples/onstate-before-render/_config.js
@@ -5,7 +5,7 @@ export default {
 
 	test(assert, component, target) {
 		assert.deepEqual(order, [
-			'onstate',
+			'onprops',
 			'render',
 			'oncreate',
 			'onupdate'
diff --git a/test/runtime/samples/onstate-before-render/main.html b/test/runtime/samples/onstate-before-render/main.html
index 572275268c..66709e0a4a 100644
--- a/test/runtime/samples/onstate-before-render/main.html
+++ b/test/runtime/samples/onstate-before-render/main.html
@@ -1,26 +1,24 @@
-{identity(42)}
-
 <script>
+	import { onmount, onprops, onupdate } from 'svelte';
+
 	import order from './order.js';
 
-	export default {
-		helpers: {
-			identity(x) {
-				order.push('render');
-				return x;
-			}
-		},
+	function identity(x) {
+		order.push('render');
+		return x;
+	}
+
+	onprops(() => {
+		order.push('onprops');
+	});
 
-		onstate() {
-			order.push('onstate');
-		},
+	onupdate(() => {
+		order.push('onupdate');
+	});
 
-		onupdate() {
-			order.push('onupdate');
-		},
+	onmount(() => {
+		order.push('oncreate');
+	});
+</script>
 
-		oncreate() {
-			order.push('oncreate');
-		}
-	};
-</script>
\ No newline at end of file
+{identity(42)}
\ No newline at end of file
diff --git a/test/runtime/samples/onstate-no-template/_config.js b/test/runtime/samples/onstate-no-template/_config.js
deleted file mode 100644
index 87d7c599ce..0000000000
--- a/test/runtime/samples/onstate-no-template/_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default {
-	'skip-ssr': true,
-
-	data: {
-		foo: 'woo!'
-	},
-
-	test(assert, component) {
-		assert.deepEqual(component.changed, { foo: 1 });
-	}
-};
diff --git a/test/runtime/samples/onstate-no-template/main.html b/test/runtime/samples/onstate-no-template/main.html
deleted file mode 100644
index a3c59f99be..0000000000
--- a/test/runtime/samples/onstate-no-template/main.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		onstate({ changed }) {
-			this.changed = changed;
-		}
-	};
-</script>
diff --git a/test/runtime/samples/onstate/main.html b/test/runtime/samples/onstate/main.html
index f35c64cd74..054db485e0 100644
--- a/test/runtime/samples/onstate/main.html
+++ b/test/runtime/samples/onstate/main.html
@@ -1,10 +1,13 @@
-<p>{foo}</p>
-<p>{bar}</p>
-
 <script>
-	export default {
-		onstate({ current }) {
-			this.set({ bar: current.foo.toUpperCase() });
-		}
-	};
-</script>
\ No newline at end of file
+	import { onprops } from 'svelte';
+
+	export let foo;
+	export let bar;
+
+	onprops(() => {
+		bar = foo.toUpperCase();
+	});
+</script>
+
+<p>{foo}</p>
+<p>{bar}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/onupdate/main.html b/test/runtime/samples/onupdate/main.html
index 49afda13e5..ab80973fb2 100644
--- a/test/runtime/samples/onupdate/main.html
+++ b/test/runtime/samples/onupdate/main.html
@@ -1,12 +1,15 @@
-<p ref:a>{value}</p>
-<p ref:b></p>
-
 <script>
-	export default {
-		onupdate({ changed, current, previous }) {
-			if (changed.value) {
-				this.refs.b.textContent = this.refs.a.textContent;
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	import { onupdate } from 'svelte';
+
+	export let a;
+	export let b;
+
+	export let value;
+
+	onupdate(() => {
+		b.textContent = a.textContent;
+	});
+</script>
+
+<p ref:a>{value}</p>
+<p ref:b></p>
\ No newline at end of file
diff --git a/test/runtime/samples/options/main.html b/test/runtime/samples/options/main.html
index 1053bc4c0a..e33a0ea223 100644
--- a/test/runtime/samples/options/main.html
+++ b/test/runtime/samples/options/main.html
@@ -1,11 +1,11 @@
-<p>{text}</p>
-
 <script>
-	export default {
-		oncreate() {
-			this.set({
-				text: this.options.text
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	import { onmount } from 'svelte';
+
+	export let text;
+
+	onmount(() => {
+		text = this.options.text;
+	});
+</script>
+
+<p>{text}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/preload/main.html b/test/runtime/samples/preload/main.html
index ef3f260679..b46e2a103e 100644
--- a/test/runtime/samples/preload/main.html
+++ b/test/runtime/samples/preload/main.html
@@ -1,9 +1,7 @@
-<script>
-	export default {
-		preload({ foo }) {
-			return {
-				bar: foo * 2
-			};
-		}
-	};
+<script scope="shared">
+	export function preload({ foo }) {
+		return {
+			bar: foo * 2
+		};
+	}
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/select-change-handler/main.html b/test/runtime/samples/select-change-handler/main.html
index 13d9bd75af..eef7dc3dfa 100644
--- a/test/runtime/samples/select-change-handler/main.html
+++ b/test/runtime/samples/select-change-handler/main.html
@@ -1,15 +1,15 @@
-<select bind:value="selected" on:change="updateLastChangedTo(selected)">
+<script>
+	export let selected;
+	export let options;
+	export let lastChangedTo;
+
+	export function updateLastChangedTo(result) {
+		lastChangedTo = result;
+	}
+</script>
+
+<select bind:value="selected" on:change="{() => updateLastChangedTo(selected)}">
 	{#each options as option}
 		<option value="{option.id}">{option.id}</option>
 	{/each}
 </select>
-
-<script>
-	export default {
-		methods: {
-			updateLastChangedTo(result) {
-				this.set({ lastChangedTo: result });
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/select-props/main.html b/test/runtime/samples/select-props/main.html
index 9886a8b7b1..ff3855f085 100644
--- a/test/runtime/samples/select-props/main.html
+++ b/test/runtime/samples/select-props/main.html
@@ -1,19 +1,15 @@
+<script>
+	export let foo = [ 1, 2 ];
+	export let log = [];
+
+	export function handler(bar) {
+		log = log.concat(bar);
+	}
+</script>
+
 {#each foo as bar}
-	<select on:change='handler(bar)'>
+	<select on:change='{() => handler(bar)}'>
 		<option>a</option>
 		<option>b</option>
 	</select>
 {/each}
-
-<script>
-	export default {
-		data: () => ({ foo: [ 1, 2 ], log: [] }),
-		methods: {
-			handler ( bar ) {
-				let { log } = this.get();
-				log.push( bar );
-				this.set( { log } );
-			}
-		}
-	}
-</script>
diff --git a/test/runtime/samples/set-clones-input/main.html b/test/runtime/samples/set-clones-input/main.html
index b5291a0790..72523b5b28 100644
--- a/test/runtime/samples/set-clones-input/main.html
+++ b/test/runtime/samples/set-clones-input/main.html
@@ -1,7 +1,7 @@
 <script>
-	export default {
-		computed: {
-			b: ({ a }) => a + 1
-		}
-	};
+	export let a;
+
+	function b() {
+		return a + 1;
+	}
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/set-in-oncreate/main.html b/test/runtime/samples/set-in-oncreate/main.html
index 77633574f1..fb7f0cc5ad 100644
--- a/test/runtime/samples/set-in-oncreate/main.html
+++ b/test/runtime/samples/set-in-oncreate/main.html
@@ -1,13 +1,11 @@
-<p>{foo}</p>
-
 <script>
-	export default {
-		data: () => ({
-			foo: 1
-		}),
+	import { onmount } from 'svelte';
+
+	export let foo = 1;
 
-		oncreate () {
-			this.set({ foo: 2 });
-		}
-	};
+	onmount(() => {
+		foo = 2;
+	});
 </script>
+
+<p>{foo}</p>
diff --git a/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html b/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html
index 1d9c77e304..25900ca9a7 100644
--- a/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html
+++ b/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html
@@ -1,13 +1,14 @@
-<div>{foo.x}</div>
-
 <script>
-	export default {
-		onstate({ current, changed }) {
-			if (changed.foo || changed.bar) {
-				if (current.foo.x !== current.bar.x) {
-					throw new Error('mismatch');
-				}
-			}
+	import { onprops } from 'svelte';
+
+	export let foo;
+	export let bar;
+
+	onprops(() => {
+		if (foo.x !== bar.x) {
+			throw new Error('mismatch');
 		}
-	};
-</script>
\ No newline at end of file
+	});
+</script>
+
+<div>{foo.x}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/set-in-onstate-dedupes-renders/main.html b/test/runtime/samples/set-in-onstate-dedupes-renders/main.html
index 6813463ec1..dfe17be171 100644
--- a/test/runtime/samples/set-in-onstate-dedupes-renders/main.html
+++ b/test/runtime/samples/set-in-onstate-dedupes-renders/main.html
@@ -1,24 +1,14 @@
-<Widget foo='{foo}' bar='{bar}'/>
-
 <script>
-	import Widget from './Widget.html';
+	import { onprops } from 'svelte';
 
-	export default {
-		data () {
-			return {
-				foo: { x: 1 },
-				bar: { x: 1 }
-			}
-		},
+	import Widget from './Widget.html';
 
-		onstate({ changed, current }) {
-			if (changed.foo) {
-				this.set({ bar: current.foo });
-			}
-		},
+	export let foo = { x: 1 };
+	export let bar = { x: 1 };
 
-		components: {
-			Widget
-		}
-	};
+	onprops(() => {
+		bar = foo;
+	});
 </script>
+
+<Widget foo='{foo}' bar='{bar}'/>
diff --git a/test/runtime/samples/set-in-onstate/main.html b/test/runtime/samples/set-in-onstate/main.html
index a5776566ed..8755a79e4f 100644
--- a/test/runtime/samples/set-in-onstate/main.html
+++ b/test/runtime/samples/set-in-onstate/main.html
@@ -1,16 +1,13 @@
-<p>{foo}</p>
-<p>{bar}</p>
-
 <script>
-	export default {
-		data: () => ({
-			foo: 1
-		}),
+	import { onprops } from 'svelte';
+
+	export let foo = 1;
+	export let bar;
 
-		onstate({ changed, current }) {
-			if (changed.foo) {
-				this.set({ bar: current.foo * 2 });
-			}
-		}
-	};
+	onprops(() => {
+		bar = foo * 2;
+	});
 </script>
+
+<p>{foo}</p>
+<p>{bar}</p>
diff --git a/test/runtime/samples/set-prevents-loop/main.html b/test/runtime/samples/set-prevents-loop/main.html
index 685bfeaa14..890e81db7b 100644
--- a/test/runtime/samples/set-prevents-loop/main.html
+++ b/test/runtime/samples/set-prevents-loop/main.html
@@ -1,20 +1,12 @@
+<script>
+	import Foo from './Foo.html';
+
+	export let visible = true;
+	export let answer = 42;
+</script>
+
 {#if visible}
 	<Foo bind:answer/>
 {:else}
 	<Foo bind:answer/>
 {/if}
-
-<script>
-	import Foo from './Foo.html';
-
-	export default {
-		data: () => ({
-			visible: true,
-			answer: 42
-		}),
-
-		components: {
-			Foo
-		}
-	};
-</script>
diff --git a/test/runtime/samples/set-undefined-attr/main.html b/test/runtime/samples/set-undefined-attr/main.html
index 09e63ca45b..a4d96e012f 100644
--- a/test/runtime/samples/set-undefined-attr/main.html
+++ b/test/runtime/samples/set-undefined-attr/main.html
@@ -1,14 +1,12 @@
-<div {foo} {bar}></div>
-
 <script>
-	export default {
-		data: () => ({
-			foo: 1,
-			bar: undefined
-		}),
+	import { onmount } from 'svelte';
+
+	export let foo = 1;
+	export let bar;
 
-		oncreate () {
-			this.set({ foo: undefined });
-		}
-	};
+	onmount(() => {
+		foo = undefined;
+	});
 </script>
+
+<div {foo} {bar}></div>
diff --git a/test/runtime/samples/setup/_config.js b/test/runtime/samples/setup/_config.js
deleted file mode 100644
index 47b0cf332e..0000000000
--- a/test/runtime/samples/setup/_config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	test(assert, component) {
-		assert.ok(component.constructor.FOO);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/setup/main.html b/test/runtime/samples/setup/main.html
deleted file mode 100644
index a1192323c9..0000000000
--- a/test/runtime/samples/setup/main.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		setup(Component) {
-			Component.FOO = true;
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/sigil-component-attribute/main.html b/test/runtime/samples/sigil-component-attribute/main.html
index a5abcd92e5..93ff1b8fe6 100644
--- a/test/runtime/samples/sigil-component-attribute/main.html
+++ b/test/runtime/samples/sigil-component-attribute/main.html
@@ -1,6 +1,6 @@
-<Widget value='foo @ {foo} # foo'/>
-
 <script>
 	import Widget from './Widget.html';
-	export default { components: { Widget } };
+	export let foo;
 </script>
+
+<Widget value='foo @ {foo} # foo'/>
diff --git a/test/runtime/samples/spread-component-dynamic/main.html b/test/runtime/samples/spread-component-dynamic/main.html
index 7b89cf5a19..4b83ee5307 100644
--- a/test/runtime/samples/spread-component-dynamic/main.html
+++ b/test/runtime/samples/spread-component-dynamic/main.html
@@ -1,13 +1,7 @@
-<svelte:component this={Foo} {...props} />
-
 <script>
 	import Foo from './Foo.html';
 
-	export default {
-		data() {
-			return {
-				Foo
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let props;
+</script>
+
+<svelte:component this={Foo} {...props} />
\ No newline at end of file
diff --git a/test/runtime/samples/spread-component-multiple-dependencies/main.html b/test/runtime/samples/spread-component-multiple-dependencies/main.html
index dedfa27477..79ed1d2974 100644
--- a/test/runtime/samples/spread-component-multiple-dependencies/main.html
+++ b/test/runtime/samples/spread-component-multiple-dependencies/main.html
@@ -1,13 +1,10 @@
-<Widget foo={foo ? a : b} {...bar}/>
-
 <script>
-	export default {
-		components: { Widget: './Widget.html' },
-		data: () => ({
-			foo: false,
-			a: 'a',
-			b: 'b',
-			bar: { baz: 'baz' },
-		}),
-	};
+	export let foo = false;
+	export let a = 'a';
+	export let b = 'b';
+	export let bar = { baz: 'baz' };
+
+	import Widget from './Widget.html';
 </script>
+
+<Widget foo={foo ? a : b} {...bar}/>
diff --git a/test/runtime/samples/spread-component-with-bind/main.html b/test/runtime/samples/spread-component-with-bind/main.html
index 97ad6f7e44..7b63a385c4 100644
--- a/test/runtime/samples/spread-component-with-bind/main.html
+++ b/test/runtime/samples/spread-component-with-bind/main.html
@@ -1,15 +1,8 @@
-<svelte:component this={Widget} {...props} bind:value="x" />
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		data() {
-			return {
-				Widget,
-				x: 'foo',
-				props: {}
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	export let props = {};
+	export let x = 'foo';
+</script>
+
+<svelte:component this={Widget} {...props} bind:value="x" />
\ No newline at end of file
diff --git a/test/runtime/samples/spread-component/main.html b/test/runtime/samples/spread-component/main.html
index ea7e0a812c..351a7964ef 100644
--- a/test/runtime/samples/spread-component/main.html
+++ b/test/runtime/samples/spread-component/main.html
@@ -1,11 +1,9 @@
-<div>
-	<Widget {...props} qux="named"/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget }
-	};
+	export let props;
 </script>
+
+<div>
+	<Widget {...props} qux="named"/>
+</div>
diff --git a/test/runtime/samples/spread-each-component/main.html b/test/runtime/samples/spread-each-component/main.html
index 0e1e9ce1d6..2124861160 100644
--- a/test/runtime/samples/spread-each-component/main.html
+++ b/test/runtime/samples/spread-each-component/main.html
@@ -1,11 +1,9 @@
-{#each things as thing}
-	<Nested {...thing}/>
-{/each}
-
 <script>
 	import Nested from './Nested.html';
 
-	export default {
-		components: { Nested }
-	};
-</script>
\ No newline at end of file
+	export let things;
+</script>
+
+{#each things as thing}
+	<Nested {...thing}/>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element-multiple-dependencies/main.html b/test/runtime/samples/spread-element-multiple-dependencies/main.html
index f6f436714d..a1ed0ba645 100644
--- a/test/runtime/samples/spread-element-multiple-dependencies/main.html
+++ b/test/runtime/samples/spread-element-multiple-dependencies/main.html
@@ -1,12 +1,8 @@
-<div class={foo ? a : b} {...bar}></div>
-
 <script>
-	export default {
-		data: () => ({
-			foo: false,
-			a: 'a',
-			b: 'b',
-			bar: { title: 'baz' },
-		}),
-	};
+	export let foo = false;
+	export let a = 'a';
+	export let b = 'b';
+	export let bar = { title: 'baz' };
 </script>
+
+<div class={foo ? a : b} {...bar}></div>
diff --git a/test/runtime/samples/spread-element/main.html b/test/runtime/samples/spread-element/main.html
index 391566826f..bf469e30ed 100644
--- a/test/runtime/samples/spread-element/main.html
+++ b/test/runtime/samples/spread-element/main.html
@@ -1,13 +1,9 @@
-<div {...props} data-named="value">{color}</div>
-
 <script>
-	export default {
-		data: () => ({
-			color: 'red',
-			props: {
-				'data-foo': 'bar',
-				'data-named': 'qux'
-			}
-		})
+	export let props = {
+		'data-foo': 'bar',
+		'data-named': 'qux'
 	};
+	export let color = 'red';
 </script>
+
+<div {...props} data-named="value">{color}</div>
diff --git a/test/runtime/samples/store-binding/NameInput.html b/test/runtime/samples/store-binding/NameInput.html
deleted file mode 100644
index a5e4f5e48c..0000000000
--- a/test/runtime/samples/store-binding/NameInput.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value=$name>
\ No newline at end of file
diff --git a/test/runtime/samples/store-binding/_config.js b/test/runtime/samples/store-binding/_config.js
deleted file mode 100644
index 1b257f47e5..0000000000
--- a/test/runtime/samples/store-binding/_config.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	name: 'world'
-});
-
-export default {
-	store,
-
-	html: `
-		<h1>Hello world!</h1>
-		<input>
-	`,
-
-	ssrHtml: `
-		<h1>Hello world!</h1>
-		<input value=world>
-	`,
-
-	test(assert, component, target, window) {
-		const input = target.querySelector('input');
-		const event = new window.Event('input');
-
-		input.value = 'everybody';
-		input.dispatchEvent(event);
-
-		assert.equal(store.get().name, 'everybody');
-		assert.htmlEqual(target.innerHTML, `
-			<h1>Hello everybody!</h1>
-			<input>
-		`);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-binding/main.html b/test/runtime/samples/store-binding/main.html
deleted file mode 100644
index 0f9e902bf3..0000000000
--- a/test/runtime/samples/store-binding/main.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>Hello {$name}!</h1>
-<NameInput/>
-
-<script>
-	import NameInput from './NameInput.html';
-
-	export default {
-		components: { NameInput }
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-child-data/Component.html b/test/runtime/samples/store-child-data/Component.html
deleted file mode 100644
index df36fe5262..0000000000
--- a/test/runtime/samples/store-child-data/Component.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>{$items[index].title}</h1>
\ No newline at end of file
diff --git a/test/runtime/samples/store-child-data/_config.js b/test/runtime/samples/store-child-data/_config.js
deleted file mode 100644
index 4322386f45..0000000000
--- a/test/runtime/samples/store-child-data/_config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	selectedIndex: 0,
-	items: [{ title: 'One' }, { title: 'Two' }]
-});
-
-export default {
-	store,
-
-	html: `
-		<h1>One</h1>
-	`,
-
-	test(assert, component, target, window) {
-		store.set({ selectedIndex: 2, items: [{ title: 'One' }, { title: 'Two' }, { title: 'Three' }]});
-
-		assert.htmlEqual(target.innerHTML, `
-			<h1>Three</h1>
-		`);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-child-data/main.html b/test/runtime/samples/store-child-data/main.html
deleted file mode 100644
index 0f3f9862de..0000000000
--- a/test/runtime/samples/store-child-data/main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<Component index={$selectedIndex}/>
-
-<script>
-	import Component from './Component.html';
-
-	export default {
-		components: { Component },
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding-deep/TextInput.html b/test/runtime/samples/store-component-binding-deep/TextInput.html
deleted file mode 100644
index f24d608cd5..0000000000
--- a/test/runtime/samples/store-component-binding-deep/TextInput.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding-deep/_config.js b/test/runtime/samples/store-component-binding-deep/_config.js
deleted file mode 100644
index 39c48445a6..0000000000
--- a/test/runtime/samples/store-component-binding-deep/_config.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	name: {
-		value: 'world'
-	}
-});
-
-export default {
-	store,
-
-	html: `
-		<h1>Hello world!</h1>
-		<input>
-	`,
-
-	ssrHtml: `
-		<h1>Hello world!</h1>
-		<input value=world>
-	`,
-
-	test(assert, component, target, window) {
-		const input = target.querySelector('input');
-		const event = new window.Event('input');
-
-		const changeRecord = [];
-		store.on('state', ({ changed, current }) => {
-			changeRecord.push({ changed, current });
-		});
-
-		input.value = 'everybody';
-		input.dispatchEvent(event);
-
-		assert.equal(store.get().name.value, 'everybody');
-		assert.htmlEqual(target.innerHTML, `
-			<h1>Hello everybody!</h1>
-			<input>
-		`);
-
-		assert.deepEqual(changeRecord, [
-			{
-				current: { name: { value: 'everybody' } },
-				changed: { name: true }
-			}
-		]);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding-deep/main.html b/test/runtime/samples/store-component-binding-deep/main.html
deleted file mode 100644
index 578c14cedb..0000000000
--- a/test/runtime/samples/store-component-binding-deep/main.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>Hello {$name.value}!</h1>
-<TextInput bind:value=$name.value/>
-
-<script>
-	import TextInput from './TextInput.html';
-
-	export default {
-		components: { TextInput }
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding-each/Widget.html b/test/runtime/samples/store-component-binding-each/Widget.html
deleted file mode 100644
index f24d608cd5..0000000000
--- a/test/runtime/samples/store-component-binding-each/Widget.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding-each/_config.js b/test/runtime/samples/store-component-binding-each/_config.js
deleted file mode 100644
index 32aa44bee4..0000000000
--- a/test/runtime/samples/store-component-binding-each/_config.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	a: ['foo', 'bar', 'baz']
-});
-
-export default {
-	store,
-
-	html: `
-		<input>
-		<input>
-		<input>
-		<p>foo, bar, baz</p>
-	`,
-
-	ssrHtml: `
-		<input value=foo>
-		<input value=bar>
-		<input value=baz>
-		<p>foo, bar, baz</p>
-	`,
-
-	test(assert, component, target, window) {
-		const event = new window.MouseEvent('input');
-		const inputs = target.querySelectorAll('input');
-
-		inputs[0].value = 'blah';
-		inputs[0].dispatchEvent(event);
-
-		assert.deepEqual(store.get().a, ['blah', 'bar', 'baz']);
-		assert.htmlEqual(target.innerHTML, `
-			<input>
-			<input>
-			<input>
-			<p>blah, bar, baz</p>
-		`);
-
-		component.destroy();
-	},
-};
diff --git a/test/runtime/samples/store-component-binding-each/main.html b/test/runtime/samples/store-component-binding-each/main.html
deleted file mode 100644
index 01be9e6b45..0000000000
--- a/test/runtime/samples/store-component-binding-each/main.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{#each $a as x}
-	<Widget bind:value='x'/>
-{/each}
-
-<p>{$a.join(', ')}</p>
-
-<script>
-	import Widget from './Widget.html';
-
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
diff --git a/test/runtime/samples/store-component-binding/TextInput.html b/test/runtime/samples/store-component-binding/TextInput.html
deleted file mode 100644
index f24d608cd5..0000000000
--- a/test/runtime/samples/store-component-binding/TextInput.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding/_config.js b/test/runtime/samples/store-component-binding/_config.js
deleted file mode 100644
index 57ee8a63d1..0000000000
--- a/test/runtime/samples/store-component-binding/_config.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	name: 'world'
-});
-
-export default {
-	store,
-
-	html: `
-		<h1>Hello world!</h1>
-		<input>
-	`,
-
-	ssrHtml: `
-		<h1>Hello world!</h1>
-		<input value=world>
-	`,
-
-	test(assert, component, target, window) {
-		const input = target.querySelector('input');
-		const event = new window.Event('input');
-
-		const changeRecord = [];
-		store.on('state', ({ changed, current }) => {
-			changeRecord.push({ changed, current });
-		});
-
-		input.value = 'everybody';
-		input.dispatchEvent(event);
-
-		assert.equal(store.get().name, 'everybody');
-		assert.htmlEqual(target.innerHTML, `
-			<h1>Hello everybody!</h1>
-			<input>
-		`);
-
-		assert.deepEqual(changeRecord, [
-			{
-				current: { name: 'everybody' },
-				changed: { name: true }
-			}
-		]);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-component-binding/main.html b/test/runtime/samples/store-component-binding/main.html
deleted file mode 100644
index 8abfd6c239..0000000000
--- a/test/runtime/samples/store-component-binding/main.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>Hello {$name}!</h1>
-<TextInput bind:value=$name/>
-
-<script>
-	import TextInput from './TextInput.html';
-
-	export default {
-		components: { TextInput }
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-computed-oncreate/_config.js b/test/runtime/samples/store-computed-oncreate/_config.js
deleted file mode 100644
index 5e58271bad..0000000000
--- a/test/runtime/samples/store-computed-oncreate/_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Store } from '../../../../store.js';
-
-export default {
-	'skip-ssr': true,
-
-	store: new Store(),
-
-	html: `
-		<h1>Hello Brian!</h1>
-	`
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-computed-oncreate/main.html b/test/runtime/samples/store-computed-oncreate/main.html
deleted file mode 100644
index ce35a047b5..0000000000
--- a/test/runtime/samples/store-computed-oncreate/main.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>Hello {$name}!</h1>
-
-<script>
-	export default {
-		oncreate() {
-			this.store.set({ user: { name: 'Brian' } });
-			this.store.compute('name', ['user'], user => user && user.name);
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-computed/Todo.html b/test/runtime/samples/store-computed/Todo.html
deleted file mode 100644
index c665d86d32..0000000000
--- a/test/runtime/samples/store-computed/Todo.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{#if isVisible}
-	<div class='{todo.done ? "done": "pending"}'>{todo.description}</div>
-{/if}
-
-<script>
-	export default {
-		computed: {
-			isVisible: ({ $filter, todo }) => {
-				if ($filter === 'all') return true;
-				if ($filter === 'done') return todo.done;
-				if ($filter === 'pending') return !todo.done;
-			}
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-computed/_config.js b/test/runtime/samples/store-computed/_config.js
deleted file mode 100644
index f922a55738..0000000000
--- a/test/runtime/samples/store-computed/_config.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Store } from '../../../../store.js';
-
-class MyStore extends Store {
-	setFilter(filter) {
-		this.set({ filter });
-	}
-
-	toggleTodo(todo) {
-		todo.done = !todo.done;
-		this.set({ todos: this.get().todos });
-	}
-}
-
-const todos = [
-	{
-		description: 'Buy some milk',
-		done: true,
-	},
-	{
-		description: 'Do the laundry',
-		done: true,
-	},
-	{
-		description: "Find life's true purpose",
-		done: false,
-	}
-];
-
-const store = new MyStore({
-	filter: 'all',
-	todos
-});
-
-export default {
-	store,
-
-	html: `
-		<div class='done'>Buy some milk</div>
-		<div class='done'>Do the laundry</div>
-		<div class='pending'>Find life's true purpose</div>
-	`,
-
-	test(assert, component, target) {
-		store.setFilter('pending');
-
-		assert.htmlEqual(target.innerHTML, `
-			<div class='pending'>Find life's true purpose</div>
-		`);
-
-		store.toggleTodo(todos[1]);
-
-		assert.htmlEqual(target.innerHTML, `
-			<div class='pending'>Do the laundry</div>
-			<div class='pending'>Find life's true purpose</div>
-		`);
-
-		store.setFilter('done');
-
-		assert.htmlEqual(target.innerHTML, `
-			<div class='done'>Buy some milk</div>
-		`);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-computed/main.html b/test/runtime/samples/store-computed/main.html
deleted file mode 100644
index 42af517dde..0000000000
--- a/test/runtime/samples/store-computed/main.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{#each $todos as todo}
-	<Todo {todo}/>
-{/each}
-
-<script>
-	import Todo from './Todo.html';
-
-	export default {
-		components: { Todo }
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-event/NameInput.html b/test/runtime/samples/store-event/NameInput.html
deleted file mode 100644
index d1d31bf64e..0000000000
--- a/test/runtime/samples/store-event/NameInput.html
+++ /dev/null
@@ -1 +0,0 @@
-<input on:input='$setName(this.value)'>
\ No newline at end of file
diff --git a/test/runtime/samples/store-event/_config.js b/test/runtime/samples/store-event/_config.js
deleted file mode 100644
index 58afa15611..0000000000
--- a/test/runtime/samples/store-event/_config.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Store } from '../../../../store.js';
-
-class MyStore extends Store {
-	setName(name) {
-		this.set({ name });
-	}
-}
-
-const store = new MyStore({
-	name: 'world'
-});
-
-export default {
-	store,
-
-	html: `
-		<h1>Hello world!</h1>
-		<input>
-	`,
-
-	test(assert, component, target, window) {
-		const input = target.querySelector('input');
-		const event = new window.Event('input');
-
-		input.value = 'everybody';
-		input.dispatchEvent(event);
-
-		assert.equal(store.get().name, 'everybody');
-		assert.htmlEqual(target.innerHTML, `
-			<h1>Hello everybody!</h1>
-			<input>
-		`);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-event/main.html b/test/runtime/samples/store-event/main.html
deleted file mode 100644
index 0f9e902bf3..0000000000
--- a/test/runtime/samples/store-event/main.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>Hello {$name}!</h1>
-<NameInput/>
-
-<script>
-	import NameInput from './NameInput.html';
-
-	export default {
-		components: { NameInput }
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/store-nested/Nested.html b/test/runtime/samples/store-nested/Nested.html
deleted file mode 100644
index 0ba00df434..0000000000
--- a/test/runtime/samples/store-nested/Nested.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>Hello, {$name}!</h1>
-
-<script>
-	import { Store } from '../../../../store.js';
-
-	export default {
-		store () {
-			return new Store({
-				name: 'world'
-			});
-		},
-	};
-</script>
diff --git a/test/runtime/samples/store-nested/_config.js b/test/runtime/samples/store-nested/_config.js
deleted file mode 100644
index 594bd65873..0000000000
--- a/test/runtime/samples/store-nested/_config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	html: `
-		<h1>Hello, world!</h1>
-	`,
-};
diff --git a/test/runtime/samples/store-nested/main.html b/test/runtime/samples/store-nested/main.html
deleted file mode 100644
index a1e069b2a1..0000000000
--- a/test/runtime/samples/store-nested/main.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<Nested/>
-
-<script>
-	import Nested from './Nested.html';
-
-	export default {
-		components: {
-			Nested
-		}
-	};
-</script>
diff --git a/test/runtime/samples/store-onstate-dollar/_config.js b/test/runtime/samples/store-onstate-dollar/_config.js
deleted file mode 100644
index 281fa76299..0000000000
--- a/test/runtime/samples/store-onstate-dollar/_config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	name: 'world'
-});
-
-export default {
-	store,
-
-	html: `<h1>Hello world!</h1>`,
-
-	compileOptions: {
-		dev: true
-	},
-
-	test(assert, component) {
-		const names = [];
-
-		component.on('state', ({ current }) => {
-			names.push(current.$name);
-		});
-
-		store.set({ name: 'everybody' });
-
-		assert.deepEqual(names, ['everybody']);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store-onstate-dollar/main.html b/test/runtime/samples/store-onstate-dollar/main.html
deleted file mode 100644
index ddb69c2148..0000000000
--- a/test/runtime/samples/store-onstate-dollar/main.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Hello {$name}!</h1>
\ No newline at end of file
diff --git a/test/runtime/samples/store-root/Nested.html b/test/runtime/samples/store-root/Nested.html
deleted file mode 100644
index 2bee21b9b1..0000000000
--- a/test/runtime/samples/store-root/Nested.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>It's nice to see you, {$name}.</p>
\ No newline at end of file
diff --git a/test/runtime/samples/store-root/_config.js b/test/runtime/samples/store-root/_config.js
deleted file mode 100644
index 278cbff30b..0000000000
--- a/test/runtime/samples/store-root/_config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default {
-	html: `
-		<h1>Hello world!</h1>
-		<p>It's nice to see you, world.</p>
-	`,
-
-	test(assert, component, target) {
-		component.store.set({ name: 'everybody' });
-
-		assert.htmlEqual(target.innerHTML, `
-			<h1>Hello everybody!</h1>
-			<p>It's nice to see you, everybody.</p>
-		`);
-	}
-};
diff --git a/test/runtime/samples/store-root/main.html b/test/runtime/samples/store-root/main.html
deleted file mode 100644
index b880433bee..0000000000
--- a/test/runtime/samples/store-root/main.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>Hello {$name}!</h1>
-<Nested/>
-
-<script>
-	import { Store } from '../../../../store.js';
-	import Nested from './Nested.html';
-
-	export default {
-		store () {
-			return new Store({
-				name: 'world'
-			});
-		},
-
-		components: {
-			Nested
-		}
-	};
-</script>
diff --git a/test/runtime/samples/store/_config.js b/test/runtime/samples/store/_config.js
deleted file mode 100644
index 4e266ff095..0000000000
--- a/test/runtime/samples/store/_config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Store } from '../../../../store.js';
-
-const store = new Store({
-	name: 'world'
-});
-
-export default {
-	store,
-
-	html: `<h1>Hello world!</h1>`,
-
-	test(assert, component, target) {
-		store.set({ name: 'everybody' });
-
-		assert.htmlEqual(target.innerHTML, `<h1>Hello everybody!</h1>`);
-	}
-};
\ No newline at end of file
diff --git a/test/runtime/samples/store/main.html b/test/runtime/samples/store/main.html
deleted file mode 100644
index ddb69c2148..0000000000
--- a/test/runtime/samples/store/main.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Hello {$name}!</h1>
\ No newline at end of file
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
index 143b2f8223..dca8ea49ce 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
@@ -1,7 +1,8 @@
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
-
 <script>
-	export default {
-		namespace: `svg`
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
index 6ae6ad8590..9e82368dbc 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
@@ -1,11 +1,12 @@
-<svg>
-	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
-</svg>
-
 <script>
 	import Rect from './Rect.html';
 
-	export default {
-		components: { Rect }
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<svg>
+	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+</svg>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
index 536f47107e..4e72c96fbe 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
@@ -1,7 +1,10 @@
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+<svelte:meta namespace="svg"/>
 
 <script>
-	export default {
-		namespace: 'svg'
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
index 6ae6ad8590..9e82368dbc 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
@@ -1,11 +1,12 @@
-<svg>
-	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
-</svg>
-
 <script>
 	import Rect from './Rect.html';
 
-	export default {
-		components: { Rect }
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<svg>
+	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+</svg>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
index d6c96e8e49..b9d1584b44 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
@@ -1,7 +1,10 @@
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+<svelte:meta namespace="http://www.w3.org/2000/svg"/>
 
 <script>
-	export default {
-		namespace: 'http://www.w3.org/2000/svg'
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace/main.html b/test/runtime/samples/svg-child-component-declared-namespace/main.html
index 6ae6ad8590..9e82368dbc 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace/main.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace/main.html
@@ -1,11 +1,12 @@
-<svg>
-	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
-</svg>
-
 <script>
 	import Rect from './Rect.html';
 
-	export default {
-		components: { Rect }
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<svg>
+	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+</svg>
diff --git a/test/runtime/samples/svg-each-block-namespace/main.html b/test/runtime/samples/svg-each-block-namespace/main.html
index 4a85ffb641..94bf834c68 100644
--- a/test/runtime/samples/svg-each-block-namespace/main.html
+++ b/test/runtime/samples/svg-each-block-namespace/main.html
@@ -1,15 +1,9 @@
+<script>
+	export let colours = [ 'red', 'green', 'blue' ];
+</script>
+
 <svg>
 	{#each colours as colour, i}
 		<circle cx='{i * 100}' cy='100' r='100' fill='{colour}'/>
 	{/each}
 </svg>
-
-<script>
-	export default {
-		data () {
-			return {
-				colours: [ 'red', 'green', 'blue' ]
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/transition-css-deferred-removal/main.html b/test/runtime/samples/transition-css-deferred-removal/main.html
index a93aed8366..34a98ca081 100644
--- a/test/runtime/samples/transition-css-deferred-removal/main.html
+++ b/test/runtime/samples/transition-css-deferred-removal/main.html
@@ -1,31 +1,29 @@
+<script>
+	export let visible;
+
+	function foo(node) {
+		return {
+			duration: 200,
+			css: t => {
+				return `opacity: ${t}`;
+			}
+		};
+	}
+
+	function bar(node) {
+		return {
+			duration: 100,
+			css: t => {
+				return `left: ${t * 100}px`;
+			}
+		};
+	}
+</script>
+
 {#if visible}
 	<span class='outer' out:foo>
 		<span class='inner' out:bar>
 			double transition
 		</span>
 	</span>
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node) {
-				return {
-					duration: 200,
-					css: t => {
-						return `opacity: ${t}`;
-					}
-				};
-			},
-
-			bar(node) {
-				return {
-					duration: 100,
-					css: t => {
-						return `left: ${t * 100}px`;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-delay/main.html b/test/runtime/samples/transition-css-delay/main.html
index 46a46aa527..faf89582e8 100644
--- a/test/runtime/samples/transition-css-delay/main.html
+++ b/test/runtime/samples/transition-css-delay/main.html
@@ -1,19 +1,17 @@
-{#if visible}
-	<div transition:foo>delayed</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					delay: 50,
-					duration: 100,
-					css: t => {
-						return `opacity: ${t}`;
-					}
-				};
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			delay: 50,
+			duration: 100,
+			css: t => {
+				return `opacity: ${t}`;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo>delayed</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-duration/main.html b/test/runtime/samples/transition-css-duration/main.html
index e10df79f55..c79672f21b 100644
--- a/test/runtime/samples/transition-css-duration/main.html
+++ b/test/runtime/samples/transition-css-duration/main.html
@@ -1,18 +1,16 @@
-{#if visible}
-	<div transition:foo></div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo() {
-				return {
-					duration: 100,
-					css: t => {
-						return `opacity: ${t}`;
-					}
-				};
+	export let visible;
+
+	function foo() {
+		return {
+			duration: 100,
+			css: t => {
+				return `opacity: ${t}`;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo></div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-aborted-outro-in-each/main.html b/test/runtime/samples/transition-js-aborted-outro-in-each/main.html
index fabdc527a3..689d301488 100644
--- a/test/runtime/samples/transition-js-aborted-outro-in-each/main.html
+++ b/test/runtime/samples/transition-js-aborted-outro-in-each/main.html
@@ -1,19 +1,17 @@
-{#each things as thing, i}
-	<span out:foo="{delay: i * 50}">{thing}</span>
-{/each}
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					delay: params.delay,
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let things;
+
+	function foo(node, params) {
+		return {
+			delay: params.delay,
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing, i}
+	<span out:foo="{{delay: i * 50}}">{thing}</span>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-aborted-outro/main.html b/test/runtime/samples/transition-js-aborted-outro/main.html
index 47c93a2321..564b88a388 100644
--- a/test/runtime/samples/transition-js-aborted-outro/main.html
+++ b/test/runtime/samples/transition-js-aborted-outro/main.html
@@ -1,18 +1,16 @@
-{#if visible}
-	<span out:foo>hello</span>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<span out:foo>hello</span>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-args/main.html b/test/runtime/samples/transition-js-args/main.html
index 890ec9a5e4..3b4140edab 100644
--- a/test/runtime/samples/transition-js-args/main.html
+++ b/test/runtime/samples/transition-js-args/main.html
@@ -1,17 +1,13 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: (t, u) => {
-						node.foo = t;
-						node.oof = u;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: (t, u) => {
+				node.foo = t;
+				node.oof = u;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-await-block/main.html b/test/runtime/samples/transition-js-await-block/main.html
index 9fc038fd66..0a0bb0005d 100644
--- a/test/runtime/samples/transition-js-await-block/main.html
+++ b/test/runtime/samples/transition-js-await-block/main.html
@@ -1,22 +1,20 @@
+<script>
+	export let promise;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#await promise}
 	<p class='pending' transition:foo>loading...</p>
 {:then value}
 	<p class='then' transition:foo>{value}</p>
 {:catch error}
 	<p class='catch' transition:foo>{error.message}</p>
-{/await}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-context/main.html b/test/runtime/samples/transition-js-context/main.html
index 18f5f50ec9..ae98ae5b45 100644
--- a/test/runtime/samples/transition-js-context/main.html
+++ b/test/runtime/samples/transition-js-context/main.html
@@ -1,20 +1,14 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		data() {
-			return { x: 42 };
-		},
+	export let x = 42;
 
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = this.get().x;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = x;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-deferred/main.html b/test/runtime/samples/transition-js-deferred/main.html
index 01985384ad..32e68a46f3 100644
--- a/test/runtime/samples/transition-js-deferred/main.html
+++ b/test/runtime/samples/transition-js-deferred/main.html
@@ -1,20 +1,18 @@
+<script>
+	export let visible;
+
+	function foo(node, params) {
+		return () => {
+			return {
+				duration: 100,
+				tick: t => {
+					node.foo = t;
+				}
+			};
+		};
+	}
+</script>
+
 {#if visible}
 	<div transition:foo></div>
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return () => {
-					return {
-						duration: 100,
-						tick: t => {
-							node.foo = t;
-						}
-					};
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-delay-in-out/main.html b/test/runtime/samples/transition-js-delay-in-out/main.html
index 43400fd67e..bfef30b59c 100644
--- a/test/runtime/samples/transition-js-delay-in-out/main.html
+++ b/test/runtime/samples/transition-js-delay-in-out/main.html
@@ -1,29 +1,27 @@
-{#if visible}
-	<div in:foo out:bar>delayed</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					delay: 50,
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			},
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			delay: 50,
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
 
-			bar: function ( node, params ) {
-				return {
-					delay: 50,
-					duration: 100,
-					tick: t => {
-						node.bar = t;
-					}
-				};
+	function bar(node, params) {
+		return {
+			delay: 50,
+			duration: 100,
+			tick: t => {
+				node.bar = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div in:foo out:bar>delayed</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-delay/main.html b/test/runtime/samples/transition-js-delay/main.html
index 1db651008d..dbe3427973 100644
--- a/test/runtime/samples/transition-js-delay/main.html
+++ b/test/runtime/samples/transition-js-delay/main.html
@@ -1,19 +1,17 @@
-{#if visible}
-	<div transition:foo>delayed</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					delay: 50,
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			delay: 50,
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo>delayed</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-destroyed-before-end/main.html b/test/runtime/samples/transition-js-destroyed-before-end/main.html
index e6e0ee0c63..3ec92de494 100644
--- a/test/runtime/samples/transition-js-destroyed-before-end/main.html
+++ b/test/runtime/samples/transition-js-destroyed-before-end/main.html
@@ -1,18 +1,16 @@
-{#if visible}
-	<div transition:foo>destroy me</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo>destroy me</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-dynamic-component/A.html b/test/runtime/samples/transition-js-dynamic-component/A.html
index 7671fb5c58..e1764ec76d 100644
--- a/test/runtime/samples/transition-js-dynamic-component/A.html
+++ b/test/runtime/samples/transition-js-dynamic-component/A.html
@@ -1,16 +1,12 @@
-<div transition:a>a</div>
-
 <script>
-	export default {
-		transitions: {
-			a(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.a = t;
-					}
-				};
+	function a(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.a = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:a>a</div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-dynamic-component/B.html b/test/runtime/samples/transition-js-dynamic-component/B.html
index 4ebe317cac..d242d866fc 100644
--- a/test/runtime/samples/transition-js-dynamic-component/B.html
+++ b/test/runtime/samples/transition-js-dynamic-component/B.html
@@ -1,16 +1,12 @@
-<div transition:b>b</div>
-
 <script>
-	export default {
-		transitions: {
-			b(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.b = t;
-					}
-				};
+	function b(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.b = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:b>b</div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-dynamic-component/main.html b/test/runtime/samples/transition-js-dynamic-component/main.html
index 02983215cc..85c88d9442 100644
--- a/test/runtime/samples/transition-js-dynamic-component/main.html
+++ b/test/runtime/samples/transition-js-dynamic-component/main.html
@@ -1,12 +1,8 @@
-<svelte:component this="{x ? A : B}"/>
-
 <script>
 	import A from './A.html';
 	import B from './B.html';
 
-	export default {
-		data() {
-			return { A, B };
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+</script>
+
+<svelte:component this="{x ? A : B}"/>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html b/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
index fba00bcd38..5c28cc164c 100644
--- a/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
+++ b/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
@@ -1,19 +1,18 @@
-{#if visible}
-	<div transition:foo>hello {name}!</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				global.count += 1;
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let visible;
+	export let name;
+
+	function foo(node, params) {
+		global.count += 1;
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo>hello {name}!</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-intro-outro/main.html b/test/runtime/samples/transition-js-each-block-intro-outro/main.html
index 08b2398408..a582a22eb8 100644
--- a/test/runtime/samples/transition-js-each-block-intro-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-intro-outro/main.html
@@ -1,29 +1,28 @@
+<script>
+	export let things;
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+
+	function bar(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.bar = t;
+			}
+		};
+	}
+</script>
+
 {#each things as thing}
 	{#if visible}
 		<div in:foo out:bar>{thing}</div>
 	{/if}
-{/each}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			},
-
-			bar: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.bar = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-intro/main.html b/test/runtime/samples/transition-js-each-block-intro/main.html
index 4264a2d684..d19924af61 100644
--- a/test/runtime/samples/transition-js-each-block-intro/main.html
+++ b/test/runtime/samples/transition-js-each-block-intro/main.html
@@ -1,18 +1,16 @@
-{#each things as thing}
-	<div in:foo>{thing}</div>
-{/each}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing}
+	<div in:foo>{thing}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
index 111f081d97..89282dafeb 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
@@ -1,18 +1,16 @@
-{#each things as thing (thing.name)}
-	<div transition:foo>{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing (thing.name)}
+	<div transition:foo>{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro/main.html b/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
index f6a89b5b0a..69697b444f 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
@@ -1,18 +1,16 @@
-{#each things as thing (thing.name)}
-	<div in:foo>{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing (thing.name)}
+	<div in:foo>{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-outro/main.html b/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
index e0d9722cf7..58d425d135 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
@@ -1,18 +1,16 @@
-{#each things as thing (thing.name)}
-	<div out:foo>{thing.name}</div>
-{/each}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing (thing.name)}
+	<div out:foo>{thing.name}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-outro/main.html b/test/runtime/samples/transition-js-each-block-outro/main.html
index dc8c2dce60..77301a25f5 100644
--- a/test/runtime/samples/transition-js-each-block-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-outro/main.html
@@ -1,18 +1,16 @@
-{#each things as thing}
-	<div out:foo>{thing}</div>
-{/each}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#each things as thing}
+	<div out:foo>{thing}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-events/main.html b/test/runtime/samples/transition-js-events/main.html
index 93ab47a8aa..15e99e56b9 100644
--- a/test/runtime/samples/transition-js-events/main.html
+++ b/test/runtime/samples/transition-js-events/main.html
@@ -1,45 +1,53 @@
+<!-- TODO need to rethink transition events!
+     Perhaps add on:introend etc on the elements? -->
+
+<script>
+	import { onmount } from 'svelte';
+
+	// [svelte-upgrade suggestion]
+	// manually refactor all references to __this
+	const __this = {};
+
+	export let things;
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+
+	onmount(() => {
+		__this.intros = [];
+		__this.outros = [];
+		__this.introCount = 0;
+		__this.outroCount = 0;
+
+		__this.on('intro.start', ({ node }) => {
+			__this.intros.push(node.textContent);
+			__this.introCount += 1;
+		});
+
+		__this.on('intro.end', () => {
+			__this.introCount -= 1;
+		});
+
+		__this.on('outro.start', ({ node }) => {
+			__this.outros.push(node.textContent);
+			__this.outroCount += 1;
+		});
+
+		__this.on('outro.end', () => {
+			__this.outroCount -= 1;
+		});
+	});
+</script>
+
 {#each things as thing}
 	{#if visible}
 		<p transition:foo>{thing}</p>
 	{/if}
-{/each}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		},
-
-		oncreate() {
-			this.intros = [];
-			this.outros = [];
-			this.introCount = 0;
-			this.outroCount = 0;
-
-			this.on('intro.start', ({ node }) => {
-				this.intros.push(node.textContent);
-				this.introCount += 1;
-			});
-
-			this.on('intro.end', () => {
-				this.introCount -= 1;
-			});
-
-			this.on('outro.start', ({ node }) => {
-				this.outros.push(node.textContent);
-				this.outroCount += 1;
-			});
-
-			this.on('outro.end', () => {
-				this.outroCount -= 1;
-			});
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-bidi/main.html b/test/runtime/samples/transition-js-if-block-bidi/main.html
index 379acc128e..1a34ef51b2 100644
--- a/test/runtime/samples/transition-js-if-block-bidi/main.html
+++ b/test/runtime/samples/transition-js-if-block-bidi/main.html
@@ -1,19 +1,17 @@
-{#if visible}
-	<div transition:foo>foo bidi</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				global.count += 1;
-				return {
-					duration: 400,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	export let visible;
+
+	function foo(node, params) {
+		global.count += 1;
+		return {
+			duration: 400,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo>foo bidi</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
index 97a2cb5a04..710606b4ac 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
@@ -1,3 +1,17 @@
+<script>
+	export let foo;
+	export let threshold;
+
+	function foo(node) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}
 	{#if foo}
 		{#if threshold >= number}
@@ -8,19 +22,4 @@
 			<div transition:foo>{number}</div>
 		{/if}
 	{/if}
-{/each}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
index 97a2cb5a04..710606b4ac 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
@@ -1,3 +1,17 @@
+<script>
+	export let foo;
+	export let threshold;
+
+	function foo(node) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}
 	{#if foo}
 		{#if threshold >= number}
@@ -8,19 +22,4 @@
 			<div transition:foo>{number}</div>
 		{/if}
 	{/if}
-{/each}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
index ac9ce0a18f..5d85e51c73 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
@@ -1,20 +1,18 @@
+<script>
+	export let threshold;
+
+	function foo(node) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number} 
 	{#if threshold >= number}
 		<div transition:foo>{number}</div>
 	{/if}
-{/each}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-intro-outro/main.html b/test/runtime/samples/transition-js-if-block-intro-outro/main.html
index f9b8cb445c..812356106a 100644
--- a/test/runtime/samples/transition-js-if-block-intro-outro/main.html
+++ b/test/runtime/samples/transition-js-if-block-intro-outro/main.html
@@ -1,27 +1,25 @@
-{#if visible}
-	<div in:foo out:bar>foo then bar</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 400,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			},
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			duration: 400,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
 
-			bar: function ( node, params ) {
-				return {
-					duration: 400,
-					tick: t => {
-						node.bar = t;
-					}
-				};
+	function bar(node, params) {
+		return {
+			duration: 400,
+			tick: t => {
+				node.bar = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div in:foo out:bar>foo then bar</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-intro/main.html b/test/runtime/samples/transition-js-if-block-intro/main.html
index fb089a6c8e..3be2daa56e 100644
--- a/test/runtime/samples/transition-js-if-block-intro/main.html
+++ b/test/runtime/samples/transition-js-if-block-intro/main.html
@@ -1,18 +1,16 @@
-{#if visible}
-	<div in:fade>fades in</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			fade: function ( node, params ) {
-				return {
-					duration: 400,
-					tick: t => {
-						node.style.opacity = t;
-					}
-				};
+	export let visible;
+
+	function fade(node, params) {
+		return {
+			duration: 400,
+			tick: t => {
+				node.style.opacity = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div in:fade>fades in</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-outro-timeout/main.html b/test/runtime/samples/transition-js-if-block-outro-timeout/main.html
index 7b627a9f72..3fe0327324 100644
--- a/test/runtime/samples/transition-js-if-block-outro-timeout/main.html
+++ b/test/runtime/samples/transition-js-if-block-outro-timeout/main.html
@@ -1,18 +1,18 @@
-{#if visible}
-	<div out:fade style="opacity: 1;" ref:div>yes</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			fade: function ( node, params ) {
-				return {
-					duration: 400,
-					tick: t => {
-						node.style.opacity = t;
-					}
-				};
+	export let div;
+
+	export let visible;
+
+	function fade(node, params) {
+		return {
+			duration: 400,
+			tick: t => {
+				node.style.opacity = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div out:fade style="opacity: 1;" ref:div>yes</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
index 495bfe1d3d..41809bd664 100644
--- a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
+++ b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
@@ -1,20 +1,22 @@
+<script>
+	export let yes;
+	export let no;
+
+	export let x;
+	export let z;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	<div ref:yes out:foo>{z}</div>
 {:else}
 	<div ref:no out:foo>{z}</div>
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-intro/main.html b/test/runtime/samples/transition-js-if-else-block-intro/main.html
index 0ff96c13e9..117f2ba8ee 100644
--- a/test/runtime/samples/transition-js-if-else-block-intro/main.html
+++ b/test/runtime/samples/transition-js-if-else-block-intro/main.html
@@ -1,20 +1,21 @@
+<script>
+	export let yes;
+	export let no;
+
+	export let x;
+
+	function foo(node, params) {
+		return {
+			duration: 400,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	<div ref:yes in:foo>yes</div>
 {:else}
 	<div ref:no in:foo>no</div>
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 400,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-outro/main.html b/test/runtime/samples/transition-js-if-else-block-outro/main.html
index 29b42fac52..ba5c762146 100644
--- a/test/runtime/samples/transition-js-if-else-block-outro/main.html
+++ b/test/runtime/samples/transition-js-if-else-block-outro/main.html
@@ -1,20 +1,21 @@
+<script>
+	export let yes;
+	export let no;
+
+	export let x;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	<div ref:yes out:foo>yes</div>
 {:else}
 	<div ref:no out:foo>no</div>
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-elseif-block-outro/main.html b/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
index 0072736880..ca4e4301da 100644
--- a/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
+++ b/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
@@ -1,20 +1,22 @@
+<script>
+	export let yes;
+	export let no;
+
+	export let x;
+	export let y;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	<div ref:yes out:foo>yes</div>
 {:elseif y}
 	<div ref:no out:foo>no</div>
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-initial/main.html b/test/runtime/samples/transition-js-initial/main.html
index 16ced20bc3..64d17e0db3 100644
--- a/test/runtime/samples/transition-js-initial/main.html
+++ b/test/runtime/samples/transition-js-initial/main.html
@@ -1,16 +1,12 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-intro-enabled-by-option/main.html b/test/runtime/samples/transition-js-intro-enabled-by-option/main.html
index 16ced20bc3..64d17e0db3 100644
--- a/test/runtime/samples/transition-js-intro-enabled-by-option/main.html
+++ b/test/runtime/samples/transition-js-intro-enabled-by-option/main.html
@@ -1,16 +1,12 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/Widget.html b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/Widget.html
index 16ced20bc3..64d17e0db3 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/Widget.html
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/Widget.html
@@ -1,16 +1,12 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/main.html b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/main.html
index fca2ea7607..cbcde3f1ed 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/main.html
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/main.html
@@ -1,9 +1,5 @@
-<Widget/>
-
 <script>
-	export default {
-		components: {
-			Widget: './Widget.html'
-		}
-	};
-</script>
\ No newline at end of file
+	import Widget from './Widget.html';
+</script>
+
+<Widget/>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default/main.html b/test/runtime/samples/transition-js-intro-skipped-by-default/main.html
index 16ced20bc3..64d17e0db3 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default/main.html
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default/main.html
@@ -1,16 +1,12 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-await/main.html b/test/runtime/samples/transition-js-nested-await/main.html
index 039051a8bd..bcd531c44c 100644
--- a/test/runtime/samples/transition-js-nested-await/main.html
+++ b/test/runtime/samples/transition-js-nested-await/main.html
@@ -1,20 +1,19 @@
+<script>
+	export let x;
+	export let promise;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	{#await promise then value}
 		<div transition:foo></div>
 	{/await}
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-component/Widget.html b/test/runtime/samples/transition-js-nested-component/Widget.html
index 16ced20bc3..64d17e0db3 100644
--- a/test/runtime/samples/transition-js-nested-component/Widget.html
+++ b/test/runtime/samples/transition-js-nested-component/Widget.html
@@ -1,16 +1,12 @@
-<div transition:foo></div>
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-component/main.html b/test/runtime/samples/transition-js-nested-component/main.html
index 2930f4dc16..b4b3beccd8 100644
--- a/test/runtime/samples/transition-js-nested-component/main.html
+++ b/test/runtime/samples/transition-js-nested-component/main.html
@@ -1,13 +1,9 @@
-{#if x}
-	<Widget/>
-{/if}
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: {
-			Widget: './Widget.html'
-		}
-	};
-</script>
\ No newline at end of file
+	export let x;
+</script>
+
+{#if x}
+	<Widget/>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-each-delete/main.html b/test/runtime/samples/transition-js-nested-each-delete/main.html
index e12370703e..e2cf13add3 100644
--- a/test/runtime/samples/transition-js-nested-each-delete/main.html
+++ b/test/runtime/samples/transition-js-nested-each-delete/main.html
@@ -1,20 +1,19 @@
+<script>
+	export let visible;
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if visible}
 	{#each things as thing}
 		<div transition:foo>{thing}</div>
 	{/each}
 {/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/transition-js-nested-each-keyed-2/main.html b/test/runtime/samples/transition-js-nested-each-keyed-2/main.html
index d931f220a4..89dec348a0 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed-2/main.html
+++ b/test/runtime/samples/transition-js-nested-each-keyed-2/main.html
@@ -1,9 +1,10 @@
+<script>
+	export let x;
+	export let things;
+
+	import Widget from './Widget.html';
+</script>
+
 {#if x}
 	<Widget :things/>
-{/if}
-
-<script>
-	export default {
-		components: { Widget: './Widget.html' }
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-each-keyed/main.html b/test/runtime/samples/transition-js-nested-each-keyed/main.html
index 335380695d..5f86eebf70 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed/main.html
+++ b/test/runtime/samples/transition-js-nested-each-keyed/main.html
@@ -1,20 +1,19 @@
+<script>
+	export let x;
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	{#each things as thing (thing)}
 		<div transition:foo></div>
 	{/each}
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-each/main.html b/test/runtime/samples/transition-js-nested-each/main.html
index c47940c1cf..f9be834a01 100644
--- a/test/runtime/samples/transition-js-nested-each/main.html
+++ b/test/runtime/samples/transition-js-nested-each/main.html
@@ -1,20 +1,19 @@
+<script>
+	export let x;
+	export let things;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	{#each things as thing}
 		<div transition:foo></div>
 	{/each}
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-if/main.html b/test/runtime/samples/transition-js-nested-if/main.html
index cd10c9118f..fac9e062ff 100644
--- a/test/runtime/samples/transition-js-nested-if/main.html
+++ b/test/runtime/samples/transition-js-nested-if/main.html
@@ -1,20 +1,19 @@
+<script>
+	export let x;
+	export let y;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+</script>
+
 {#if x}
 	{#if y}
 		<div transition:foo></div>
 	{/if}
-{/if}
-
-<script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-intro/Child.html b/test/runtime/samples/transition-js-nested-intro/Child.html
index 32a4b81152..341a0822e1 100644
--- a/test/runtime/samples/transition-js-nested-intro/Child.html
+++ b/test/runtime/samples/transition-js-nested-intro/Child.html
@@ -1,17 +1,13 @@
-<div transition:foo><slot></slot></div>
-
 <script>
-	export default {
-		transitions: {
-			foo: function ( node, params ) {
-				return {
-					delay: 50,
-					duration: 100,
-					tick: t => {
-						node.foo = t;
-					}
-				};
+	function foo(node, params) {
+		return {
+			delay: 50,
+			duration: 100,
+			tick: t => {
+				node.foo = t;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+<div transition:foo><slot></slot></div>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-intro/main.html b/test/runtime/samples/transition-js-nested-intro/main.html
index c06e004c8c..f222940ad5 100644
--- a/test/runtime/samples/transition-js-nested-intro/main.html
+++ b/test/runtime/samples/transition-js-nested-intro/main.html
@@ -1,10 +1,8 @@
-{#if visible}
-	<Child>delayed</Child>
-{/if}
-
 <script>
 	import Child from './Child.html';
-	export default {
-		components:{ Child }
-	};
-</script>
\ No newline at end of file
+	export let visible;
+</script>
+
+{#if visible}
+	<Child>delayed</Child>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-parameterised-with-state/main.html b/test/runtime/samples/transition-js-parameterised-with-state/main.html
index 68d036e4da..d5512f0075 100644
--- a/test/runtime/samples/transition-js-parameterised-with-state/main.html
+++ b/test/runtime/samples/transition-js-parameterised-with-state/main.html
@@ -1,18 +1,17 @@
-{#if visible}
-	<div transition:foo='{k: duration}'>fades in</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t * params.k;
-					}
-				};
+	export let visible;
+	export let duration;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t * params.k;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo='{{k: duration}}'>fades in</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-parameterised/main.html b/test/runtime/samples/transition-js-parameterised/main.html
index 5d9a59f7a7..7e022ae269 100644
--- a/test/runtime/samples/transition-js-parameterised/main.html
+++ b/test/runtime/samples/transition-js-parameterised/main.html
@@ -1,18 +1,16 @@
-{#if visible}
-	<div in:foo='{k: 200}'>fades in</div>
-{/if}
-
 <script>
-	export default {
-		transitions: {
-			foo: function(node, params) {
-				return {
-					duration: 100,
-					tick: t => {
-						node.foo = t * params.k;
-					}
-				};
+	export let visible;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t * params.k;
 			}
-		}
-	};
-</script>
\ No newline at end of file
+		};
+	}
+</script>
+
+{#if visible}
+	<div in:foo='{{k: 200}}'>fades in</div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-context/main.html b/test/runtime/samples/window-event-context/main.html
index af60672a2a..f0e37fd094 100644
--- a/test/runtime/samples/window-event-context/main.html
+++ b/test/runtime/samples/window-event-context/main.html
@@ -1,3 +1,3 @@
-<svelte:window on:click='set({ foo: !foo })'/>
+<svelte:window on:click='{() => foo = !foo}'/>
 
 {foo}
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-custom/main.html b/test/runtime/samples/window-event-custom/main.html
index 515d5bc4ca..a94c79105f 100644
--- a/test/runtime/samples/window-event-custom/main.html
+++ b/test/runtime/samples/window-event-custom/main.html
@@ -1,25 +1,19 @@
-<svelte:window on:esc="set({ escaped: true })" />
-
-<p>escaped: {escaped}</p>
-
 <script>
-	export default {
-		data() {
-			return { escaped: false };
-		},
+	export let escaped = false;
 
-		events: {
-			esc(node, callback) {
-				function onKeyDown(event) {
-					if (event.which === 27) callback(event);
-				}
-				node.addEventListener('keydown', onKeyDown);
-				return {
-					destroy() {
-						node.removeEventListener('keydown', onKeyDown);
-					}
-				};
-			}
+	function esc(node, callback) {
+		function onKeyDown(event) {
+			if (event.which === 27) callback(event);
 		}
-	};
-</script>
\ No newline at end of file
+		node.addEventListener('keydown', onKeyDown);
+		return {
+			destroy() {
+				node.removeEventListener('keydown', onKeyDown);
+			}
+		};
+	}
+</script>
+
+<svelte:window on:esc="{() => escaped = true}" />
+
+<p>escaped: {escaped}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/window-event/main.html b/test/runtime/samples/window-event/main.html
index 76f5c02084..4bf0eee526 100644
--- a/test/runtime/samples/window-event/main.html
+++ b/test/runtime/samples/window-event/main.html
@@ -1,3 +1,3 @@
-<svelte:window on:resize='set({ width: this.innerWidth, height: this.innerHeight })'/>
+<svelte:window on:resize='{() => width = this.innerWidth, height = this.innerHeight}'/>
 
 <div>{width}x{height}</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.html b/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.html
index 669d7664ac..ff6c15981d 100644
--- a/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.html
+++ b/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.html
@@ -1,16 +1,9 @@
-<div {...props}></div>
-
 <script>
-
-	export default {
-		data() {
-			return {
-				props: {
-					foo: '"></div><script>alert(42)</' + 'script>',
-					bar: "'></div><script>alert(42)</" + 'script>',
-					['"></div><script>alert(42)</' + 'script>']: 'baz'
-				}
-			};
-		}
+	export let props = {
+		foo: '"></div><script>alert(42)</' + 'script>',
+		bar: "'></div><script>alert(42)</" + 'script>',
+		['"></div><script>alert(42)</' + 'script>']: 'baz'
 	};
-</script>
\ No newline at end of file
+</script>
+
+<div {...props}></div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/attribute-escaped-quotes/main.html b/test/server-side-rendering/samples/attribute-escaped-quotes/main.html
index 47e3466ab0..ed34f4d129 100644
--- a/test/server-side-rendering/samples/attribute-escaped-quotes/main.html
+++ b/test/server-side-rendering/samples/attribute-escaped-quotes/main.html
@@ -1,12 +1,5 @@
-<div foo={foo}></div>
-
 <script>
+	export let foo = '"></div><script>alert(42)</' + 'script>';
+</script>
 
-	export default {
-		data() {
-			return {
-				foo: '"></div><script>alert(42)</' + 'script>'
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<div foo={foo}></div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/bindings/main.html b/test/server-side-rendering/samples/bindings/main.html
index 6a08ab5706..20c43fc39c 100644
--- a/test/server-side-rendering/samples/bindings/main.html
+++ b/test/server-side-rendering/samples/bindings/main.html
@@ -1,8 +1,5 @@
-<input bind:value=foo >
- <script>
-	export default {
-		data() {
-			return { foo: 'bar' };
-		}
-	};
-</script>
\ No newline at end of file
+<script>
+	export let foo = 'bar';
+</script>
+
+<input bind:value=foo >
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/component-binding-renamed/Foo.html b/test/server-side-rendering/samples/component-binding-renamed/Foo.html
index b0f08ce1d2..fd78630d30 100644
--- a/test/server-side-rendering/samples/component-binding-renamed/Foo.html
+++ b/test/server-side-rendering/samples/component-binding-renamed/Foo.html
@@ -1,11 +1,5 @@
-:foo:
-
 <script>
-	export default {
-		data () {
-			return {
-				x: 1
-			};
-		}
-	};
+	export let x = 1;
 </script>
+
+:foo:
diff --git a/test/server-side-rendering/samples/component-binding-renamed/main.html b/test/server-side-rendering/samples/component-binding-renamed/main.html
index 7f5e588534..857c2acc65 100644
--- a/test/server-side-rendering/samples/component-binding-renamed/main.html
+++ b/test/server-side-rendering/samples/component-binding-renamed/main.html
@@ -1,11 +1,8 @@
-{y}<Foo bind:y='x'/>{y}
-
 <script>
 	import Foo from './Foo.html';
 
-	export default {
-		components: {
-			Foo
-		}
-	};
+	export let y;
+	export let x;
 </script>
+
+{y}<Foo bind:y='x'/>{y}
diff --git a/test/server-side-rendering/samples/component-binding/Foo.html b/test/server-side-rendering/samples/component-binding/Foo.html
index b0f08ce1d2..fd78630d30 100644
--- a/test/server-side-rendering/samples/component-binding/Foo.html
+++ b/test/server-side-rendering/samples/component-binding/Foo.html
@@ -1,11 +1,5 @@
-:foo:
-
 <script>
-	export default {
-		data () {
-			return {
-				x: 1
-			};
-		}
-	};
+	export let x = 1;
 </script>
+
+:foo:
diff --git a/test/server-side-rendering/samples/component-binding/main.html b/test/server-side-rendering/samples/component-binding/main.html
index e4ded91077..c8742a5843 100644
--- a/test/server-side-rendering/samples/component-binding/main.html
+++ b/test/server-side-rendering/samples/component-binding/main.html
@@ -1,11 +1,7 @@
-{x}<Foo bind:x/>{x}
-
 <script>
 	import Foo from './Foo.html';
 
-	export default {
-		components: {
-			Foo
-		}
-	};
+	export let x;
 </script>
+
+{x}<Foo bind:x/>{x}
diff --git a/test/server-side-rendering/samples/component-data-dynamic/main.html b/test/server-side-rendering/samples/component-data-dynamic/main.html
index 554d4980ad..74998f4742 100644
--- a/test/server-side-rendering/samples/component-data-dynamic/main.html
+++ b/test/server-side-rendering/samples/component-data-dynamic/main.html
@@ -1,11 +1,12 @@
-<div>
-	<Widget foo='{bar}' baz='{40 + x}' qux='this is a {compound} string' quux='{go.deeper}'/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget }
-	};
+	export let bar;
+	export let x;
+	export let compound;
+	export let go;
 </script>
+
+<div>
+	<Widget foo='{bar}' baz='{40 + x}' qux='this is a {compound} string' quux='{go.deeper}'/>
+</div>
diff --git a/test/server-side-rendering/samples/component-data-empty/main.html b/test/server-side-rendering/samples/component-data-empty/main.html
index 8b797c8a60..478bcff0a1 100644
--- a/test/server-side-rendering/samples/component-data-empty/main.html
+++ b/test/server-side-rendering/samples/component-data-empty/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget foo=''/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget foo=''/>
+</div>
diff --git a/test/server-side-rendering/samples/component-refs-and-attributes/main.html b/test/server-side-rendering/samples/component-refs-and-attributes/main.html
index d0e56efa38..86b3ddf1a9 100644
--- a/test/server-side-rendering/samples/component-refs-and-attributes/main.html
+++ b/test/server-side-rendering/samples/component-refs-and-attributes/main.html
@@ -1,13 +1,9 @@
-<div><Widget ref:widget foo='{foo}'/></div>
-
 <script>
-	import Widget from './Widget.html';
+	export let widget;
 
-	export default {
-		components: { Widget },
+	import Widget from './Widget.html';
 
-		data () {
-			return { foo: 42 }
-		}
-	};
+	export let foo = 42;
 </script>
+
+<div><Widget ref:widget foo='{foo}'/></div>
diff --git a/test/server-side-rendering/samples/component-refs/main.html b/test/server-side-rendering/samples/component-refs/main.html
index 14919b51c9..55d2abc4cd 100644
--- a/test/server-side-rendering/samples/component-refs/main.html
+++ b/test/server-side-rendering/samples/component-refs/main.html
@@ -1,9 +1,7 @@
-<div><Widget ref:widget/></div>
-
 <script>
-	import Widget from './Widget.html';
+	export let widget;
 
-	export default {
-		components: { Widget }
-	};
+	import Widget from './Widget.html';
 </script>
+
+<div><Widget ref:widget/></div>
diff --git a/test/server-side-rendering/samples/component-with-different-extension/main.svelte b/test/server-side-rendering/samples/component-with-different-extension/main.svelte
index 4f02f2f94e..ac0b429163 100644
--- a/test/server-side-rendering/samples/component-with-different-extension/main.svelte
+++ b/test/server-side-rendering/samples/component-with-different-extension/main.svelte
@@ -1,11 +1,7 @@
-<div>
-	<Widget/>
-</div>
-
 <script>
 	import Widget from './Widget.svelte';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget/>
+</div>
diff --git a/test/server-side-rendering/samples/component-yield/Widget.html b/test/server-side-rendering/samples/component-yield/Widget.html
index 34efb735b9..d7159b1799 100644
--- a/test/server-side-rendering/samples/component-yield/Widget.html
+++ b/test/server-side-rendering/samples/component-yield/Widget.html
@@ -1,11 +1,5 @@
-<p><slot></slot></p>
-
 <script>
-	export default {
-		data () {
-			return {
-				data: 'this should not appear'
-			};
-		}
-	};
+	export let data = 'this should not appear';
 </script>
+
+<p><slot></slot></p>
diff --git a/test/server-side-rendering/samples/component-yield/main.html b/test/server-side-rendering/samples/component-yield/main.html
index 1e4cef5781..9c2f573c91 100644
--- a/test/server-side-rendering/samples/component-yield/main.html
+++ b/test/server-side-rendering/samples/component-yield/main.html
@@ -1,17 +1,9 @@
-<div>
-	<Widget>{data}</Widget>
-</div>
-
 <script>
 	import Widget from './Widget.html';
 
-	export default {
-		components: { Widget },
-
-		data () {
-			return {
-				data: 'Hello'
-			};
-		}
-	};
+	export let data = 'Hello';
 </script>
+
+<div>
+	<Widget>{data}</Widget>
+</div>
diff --git a/test/server-side-rendering/samples/component/main.html b/test/server-side-rendering/samples/component/main.html
index 5b119b5527..ecb4297a40 100644
--- a/test/server-side-rendering/samples/component/main.html
+++ b/test/server-side-rendering/samples/component/main.html
@@ -1,11 +1,7 @@
-<div>
-	<Widget/>
-</div>
-
 <script>
 	import Widget from './Widget.html';
-
-	export default {
-		components: { Widget }
-	};
 </script>
+
+<div>
+	<Widget/>
+</div>
diff --git a/test/server-side-rendering/samples/computed/main.html b/test/server-side-rendering/samples/computed/main.html
index d718fd052f..4143af2e0a 100644
--- a/test/server-side-rendering/samples/computed/main.html
+++ b/test/server-side-rendering/samples/computed/main.html
@@ -1,11 +1,15 @@
-<p>{a} + {b} = {c}</p>
-<p>{c} * {c} = {cSquared}</p>
-
 <script>
-	export default {
-		computed: {
-			c: ({ a, b }) => a + b,
-			cSquared: ({ c }) => c * c
-		}
-	};
+	export let a;
+	export let b;
+
+	function c() {
+		return a + b;
+	}
+
+	function cSquared() {
+		return c() * c();
+	}
 </script>
+
+<p>{a} + {b} = {c()}</p>
+<p>{c()} * {c()} = {cSquared()}</p>
diff --git a/test/server-side-rendering/samples/default-data-override/main.html b/test/server-side-rendering/samples/default-data-override/main.html
index 1014c2df07..3e42f1d4e5 100644
--- a/test/server-side-rendering/samples/default-data-override/main.html
+++ b/test/server-side-rendering/samples/default-data-override/main.html
@@ -1,11 +1,5 @@
-<p>{foo}</p>
-
 <script>
-	export default {
-		data () {
-			return {
-				foo: 1
-			}
-		}
-	};
+	export let foo = 1;
 </script>
+
+<p>{foo}</p>
diff --git a/test/server-side-rendering/samples/default-data/main.html b/test/server-side-rendering/samples/default-data/main.html
index 1014c2df07..3e42f1d4e5 100644
--- a/test/server-side-rendering/samples/default-data/main.html
+++ b/test/server-side-rendering/samples/default-data/main.html
@@ -1,11 +1,5 @@
-<p>{foo}</p>
-
 <script>
-	export default {
-		data () {
-			return {
-				foo: 1
-			}
-		}
-	};
+	export let foo = 1;
 </script>
+
+<p>{foo}</p>
diff --git a/test/server-side-rendering/samples/directives/main.html b/test/server-side-rendering/samples/directives/main.html
index a960ff707e..d8842a8673 100644
--- a/test/server-side-rendering/samples/directives/main.html
+++ b/test/server-side-rendering/samples/directives/main.html
@@ -1 +1 @@
-<button on:click='set({ foo: "bar" })'>click me</button>
+<button on:click='{() => foo = "bar"}'>click me</button>
diff --git a/test/server-side-rendering/samples/helpers/main.html b/test/server-side-rendering/samples/helpers/main.html
index 03598e7066..6001057908 100644
--- a/test/server-side-rendering/samples/helpers/main.html
+++ b/test/server-side-rendering/samples/helpers/main.html
@@ -1,15 +1,7 @@
-<p>{thrice(foo)}</p>
-
 <script>
-	export default {
-		data () {
-			return {
-				foo: 1
-			}
-		},
+	export let foo = 1;
 
-		helpers: {
-			thrice: num => 3 * num
-		}
-	};
+	const thrice = num => 3 * num;
 </script>
+
+<p>{thrice(foo)}</p>
diff --git a/test/server-side-rendering/samples/import-non-component/main.html b/test/server-side-rendering/samples/import-non-component/main.html
index 80e2413dd7..1a2814bbd5 100644
--- a/test/server-side-rendering/samples/import-non-component/main.html
+++ b/test/server-side-rendering/samples/import-non-component/main.html
@@ -1,13 +1,7 @@
-<div>i got {problems} problems</div>
-<div>the answer is {answer}</div>
-
 <script>
 	import answer from './answer.js';
 	import problems from './problems.js';
-
-	export default {
-		data () {
-			return { answer, problems };
-		}
-	};
 </script>
+
+<div>i got {problems} problems</div>
+<div>the answer is {answer}</div>
diff --git a/test/server-side-rendering/samples/sanitize-name/main.html b/test/server-side-rendering/samples/sanitize-name/main.html
index 04071bf3c5..6d7986da2e 100644
--- a/test/server-side-rendering/samples/sanitize-name/main.html
+++ b/test/server-side-rendering/samples/sanitize-name/main.html
@@ -1,9 +1,5 @@
-<Foo/>
-
 <script>
 	import Foo from './[foo].html';
+</script>
 
-	export default {
-		components: { Foo }
-	};
-</script>
\ No newline at end of file
+<Foo/>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles-nested/One.html b/test/server-side-rendering/samples/styles-nested/One.html
index 0e68dd3c28..df5512b91a 100644
--- a/test/server-side-rendering/samples/styles-nested/One.html
+++ b/test/server-side-rendering/samples/styles-nested/One.html
@@ -1,3 +1,9 @@
+<script>
+	import Two from './Two.html';
+
+	export let message;
+</script>
+
 <div>green: {message}</div>
 
 <!-- Two styles should *not* be included -->
@@ -8,11 +14,3 @@
 		color: green;
 	}
 </style>
-
-<script>
-	import Two from './Two.html';
-
-	export default {
-		components: { Two }
-	};
-</script>
diff --git a/test/server-side-rendering/samples/styles-nested/main.html b/test/server-side-rendering/samples/styles-nested/main.html
index b87d4f32dc..11775475b8 100644
--- a/test/server-side-rendering/samples/styles-nested/main.html
+++ b/test/server-side-rendering/samples/styles-nested/main.html
@@ -1,3 +1,7 @@
+<script>
+	import One from './One.html';
+</script>
+
 <div>red</div>
 <One message='foo'/>
 <One message='bar'/>
@@ -7,11 +11,3 @@
 		color: red;
 	}
 </style>
-
-<script>
-	import One from './One.html';
-
-	export default {
-		components: { One }
-	};
-</script>
diff --git a/test/server-side-rendering/samples/textarea-children/main.html b/test/server-side-rendering/samples/textarea-children/main.html
index 0dbb397274..5f37f40d5e 100644
--- a/test/server-side-rendering/samples/textarea-children/main.html
+++ b/test/server-side-rendering/samples/textarea-children/main.html
@@ -1,11 +1,7 @@
+<script>
+	export let foo = 42;
+</script>
+
 <textarea>
 	<p>not actually an element. {foo}</p>
-</textarea>
-
-<script>
-	export default {
-		data () {
-			return { foo: 42 };
-		}
-	};
-</script>
\ No newline at end of file
+</textarea>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/textarea-value/main.html b/test/server-side-rendering/samples/textarea-value/main.html
index 8413572a70..28f7f372be 100644
--- a/test/server-side-rendering/samples/textarea-value/main.html
+++ b/test/server-side-rendering/samples/textarea-value/main.html
@@ -1,9 +1,5 @@
-<textarea value='{foo}'/>
-
 <script>
-	export default {
-		data () {
-			return { foo: 42 };
-		}
-	};
-</script>
\ No newline at end of file
+	export let foo = 42;
+</script>
+
+<textarea value='{foo}'/>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/triple/main.html b/test/server-side-rendering/samples/triple/main.html
index fc7c9e514f..35d49f423b 100644
--- a/test/server-side-rendering/samples/triple/main.html
+++ b/test/server-side-rendering/samples/triple/main.html
@@ -1,11 +1,5 @@
-<div>{@html triple}</div>
-
 <script>
-	export default {
-		data () {
-			return {
-				triple: '<p>html</p>'
-			};
-		}
-	};
+	export let triple = '<p>html</p>';
 </script>
+
+<div>{@html triple}</div>
diff --git a/test/sourcemaps/samples/binding-shorthand/input.html b/test/sourcemaps/samples/binding-shorthand/input.html
index 8a1b993b6f..7ba7c7c10d 100644
--- a/test/sourcemaps/samples/binding-shorthand/input.html
+++ b/test/sourcemaps/samples/binding-shorthand/input.html
@@ -1,11 +1,7 @@
-<Widget bind:potato/>
-
 <script>
 	import Widget from 'wherever';
 
-	export default {
-		components: {
-			Widget
-		}
-	};
+	export let potato;
 </script>
+
+<Widget bind:potato/>
diff --git a/test/sourcemaps/samples/script/input.html b/test/sourcemaps/samples/script/input.html
index c171960915..d1e1d3fd26 100644
--- a/test/sourcemaps/samples/script/input.html
+++ b/test/sourcemaps/samples/script/input.html
@@ -1,9 +1,9 @@
-<div></div>
-
 <script>
-	export default {
-		oncreate () {
-			console.log( 42 );
-		}
-	}
+	import { onmount } from 'svelte';
+
+	onmount(() => {
+		console.log(42);
+	});
 </script>
+
+<div></div>
diff --git a/test/stats/samples/hooks/input.html b/test/stats/samples/hooks/input.html
index fde68977b2..885f4d3962 100644
--- a/test/stats/samples/hooks/input.html
+++ b/test/stats/samples/hooks/input.html
@@ -1,7 +1,7 @@
 <script>
-	export default {
-		oncreate() {
-			console.log('creating');
-		}
-	};
+	import { onmount } from 'svelte';
+
+	onmount(() => {
+		console.log('creating');
+	});
 </script>
\ No newline at end of file
diff --git a/test/validator/samples/a11y-not-on-components/input.html b/test/validator/samples/a11y-not-on-components/input.html
index e6073bb742..eda4d18db8 100644
--- a/test/validator/samples/a11y-not-on-components/input.html
+++ b/test/validator/samples/a11y-not-on-components/input.html
@@ -1,9 +1,3 @@
 <Widget scope="foo">
 	<input autofocus>
 </Widget>
-
-<script>
-	export default {
-		components: { Widget },
-	};
-</script>
diff --git a/test/validator/samples/await-component-is-used/input.html b/test/validator/samples/await-component-is-used/input.html
index 17f2d04d36..029b549675 100644
--- a/test/validator/samples/await-component-is-used/input.html
+++ b/test/validator/samples/await-component-is-used/input.html
@@ -1,3 +1,9 @@
+<script>
+	import Component from './Component.html';
+
+	export let promise;
+</script>
+
 {#await promise}
 	<p>Loading</p>
 {:then data}
@@ -5,13 +11,3 @@
 {:catch err}
 	<p>Error: {err}</p>
 {/await}
-
-<script>
-	import Component from './Component.html';
-
-	export default {
-		components: {
-			Component
-		}
-	};
-</script>
diff --git a/test/validator/samples/event-handler-ref/input.html b/test/validator/samples/event-handler-ref/input.html
index e4fa0dec0f..605b2db099 100644
--- a/test/validator/samples/event-handler-ref/input.html
+++ b/test/validator/samples/event-handler-ref/input.html
@@ -1,2 +1,2 @@
 <input ref:input>
-<button on:click='refs.input.focus()'>focus input</button>
\ No newline at end of file
+<button on:click='{() => refs.input.focus()}'>focus input</button>
\ No newline at end of file
diff --git a/test/validator/samples/event-modifiers-legacy/input.html b/test/validator/samples/event-modifiers-legacy/input.html
index 3ef8edeee9..c53a616fb5 100644
--- a/test/validator/samples/event-modifiers-legacy/input.html
+++ b/test/validator/samples/event-modifiers-legacy/input.html
@@ -1 +1 @@
-<button on:click|once="handleClick()"></button>
\ No newline at end of file
+<button on:click|once="{handleClick}"></button>
\ No newline at end of file
diff --git a/test/validator/samples/event-modifiers-redundant/input.html b/test/validator/samples/event-modifiers-redundant/input.html
index 2a2d390da4..3161674beb 100644
--- a/test/validator/samples/event-modifiers-redundant/input.html
+++ b/test/validator/samples/event-modifiers-redundant/input.html
@@ -1,16 +1,12 @@
-<button on:click|passive="handleClick()"></button>
-<div on:touchstart|passive="handleTouchstart()"></div>
-
 <script>
-	export default {
-		methods: {
-			handleTouchstart() {
-				// ...
-			},
+	function handleTouchstart() {
+		// ...
+	}
+
+	function handleClick() {
+		// ...
+	}
+</script>
 
-			handleClick() {
-				// ...
-			}
-		}
-	};
-</script>
\ No newline at end of file
+<button on:click|passive="{handleClick}"></button>
+<div on:touchstart|passive="{handleTouchstart}"></div>
\ 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
index d90285a094..7ddee0b901 100644
--- a/test/validator/samples/helper-clash-context/input.html
+++ b/test/validator/samples/helper-clash-context/input.html
@@ -1,17 +1,11 @@
-{#each things as thing}
-	{thing}
-{/each}
-
 <script>
-	export default {
-		data () {
-			return { things: [ 'a', 'b', 'c' ] };
-		},
+	export let things = [ 'a', 'b', 'c' ];
 
-		helpers: {
-			thing: function ( x ) {
-				return x;
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	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-purity-check-needs-arguments/input.html b/test/validator/samples/helper-purity-check-needs-arguments/input.html
deleted file mode 100644
index 9c0a6f8ef6..0000000000
--- a/test/validator/samples/helper-purity-check-needs-arguments/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{foo()}
-
-<script>
-	export default {
-		helpers: {
-			foo () {
-				return Math.random();
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-needs-arguments/warnings.json b/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
deleted file mode 100644
index 55048039d2..0000000000
--- a/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "impure-helper",
-	"message": "Helpers should be pure functions, with at least one argument",
-	"pos": 52,
-	"start": {
-		"line": 6,
-		"column": 3,
-		"character": 52
-	},
-	"end": {
-		"line": 8,
-		"column": 4,
-		"character": 91
-	}
-}]
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-uses-arguments/input.html b/test/validator/samples/helper-purity-check-uses-arguments/input.html
index 8395021487..0f7c690039 100644
--- a/test/validator/samples/helper-purity-check-uses-arguments/input.html
+++ b/test/validator/samples/helper-purity-check-uses-arguments/input.html
@@ -1,13 +1,9 @@
-{sum(1, 2, 3)}
-
 <script>
-	export default {
-		helpers: {
-			sum () {
-				var total = '';
-				for ( var i = 0; i < arguments.length; i += 1 ) total += arguments[i];
-				return total;
-			}
-		}
+	function sum() {
+		var total = '';
+		for ( var i = 0; i < arguments.length; i += 1 ) total += arguments[i];
+		return total;
 	}
-</script>
\ No newline at end of file
+</script>
+
+{sum(1, 2, 3)}
\ No newline at end of file
diff --git a/test/validator/samples/method-nonexistent-helper/input.html b/test/validator/samples/method-nonexistent-helper/input.html
index abb756f6c3..20bb05b72c 100644
--- a/test/validator/samples/method-nonexistent-helper/input.html
+++ b/test/validator/samples/method-nonexistent-helper/input.html
@@ -1,17 +1,11 @@
-<button on:click='foo()'></button>
-
 <script>
-	export default {
-		methods: {
-			bar () {
-				// ...
-			}
-		},
+	function bar() {
+		// ...
+	}
 
-		helpers: {
-			foo ( x ) {
-				return x;
-			}
-		}
-	};
+	function foo(x) {
+		return x;
+	}
 </script>
+
+<button on:click='{foo}'></button>
diff --git a/test/validator/samples/method-nonexistent/input.html b/test/validator/samples/method-nonexistent/input.html
index 75f2028b92..8700637ce4 100644
--- a/test/validator/samples/method-nonexistent/input.html
+++ b/test/validator/samples/method-nonexistent/input.html
@@ -1,11 +1,7 @@
-<button on:click='foo()'></button>
-
 <script>
-	export default {
-		methods: {
-			bar () {
-				// ...
-			}
-		}
-	};
+	function bar() {
+		// ...
+	}
 </script>
+
+<button on:click='{foo}'></button>
diff --git a/test/validator/samples/oncreate-arrow-no-this/input.html b/test/validator/samples/oncreate-arrow-no-this/input.html
index a8e0988595..218f00232f 100644
--- a/test/validator/samples/oncreate-arrow-no-this/input.html
+++ b/test/validator/samples/oncreate-arrow-no-this/input.html
@@ -1,5 +1,5 @@
 <script>
-	export default {
-		oncreate: () => console.log( 'rendering' )
-	};
+	import { onmount } from 'svelte';
+
+	onmount(() => console.log( 'rendering' ));
 </script>
diff --git a/test/validator/samples/ondestroy-arrow-no-this/input.html b/test/validator/samples/ondestroy-arrow-no-this/input.html
index 1237541ebc..addd9cc4db 100644
--- a/test/validator/samples/ondestroy-arrow-no-this/input.html
+++ b/test/validator/samples/ondestroy-arrow-no-this/input.html
@@ -1,5 +1,5 @@
 <script>
-	export default {
-		ondestroy: () => console.log( 'tearing down' )
-	};
+	import { ondestroy } from 'svelte';
+
+	ondestroy(() => console.log( 'tearing down' ));
 </script>
diff --git a/test/validator/samples/onstate-arrow-no-this/input.html b/test/validator/samples/onstate-arrow-no-this/input.html
index dcd651f66a..e3ed7ae7f0 100644
--- a/test/validator/samples/onstate-arrow-no-this/input.html
+++ b/test/validator/samples/onstate-arrow-no-this/input.html
@@ -1,5 +1,5 @@
 <script>
-	export default {
-		onstate: () => console.log('updating')
-	};
+	import { onprops } from 'svelte';
+
+	onprops(() => console.log('updating'));
 </script>
diff --git a/test/validator/samples/onupdate-arrow-no-this/input.html b/test/validator/samples/onupdate-arrow-no-this/input.html
index 72c35b0df9..f0bc35c9f0 100644
--- a/test/validator/samples/onupdate-arrow-no-this/input.html
+++ b/test/validator/samples/onupdate-arrow-no-this/input.html
@@ -1,5 +1,5 @@
 <script>
-	export default {
-		onupdate: () => console.log('updating')
-	};
+	import { onupdate } from 'svelte';
+
+	onupdate(() => console.log('updating'));
 </script>
diff --git a/test/validator/samples/store-invalid-callee/input.html b/test/validator/samples/store-invalid-callee/input.html
index 2184dab288..2156f9e5ee 100644
--- a/test/validator/samples/store-invalid-callee/input.html
+++ b/test/validator/samples/store-invalid-callee/input.html
@@ -1 +1 @@
-<button on:click="store.set({ foo: 'bar' })">click me</button>
\ No newline at end of file
+<button on:click="{() => store.set({ foo: 'bar' })}">click me</button>
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-declared-namespace/input.html b/test/validator/samples/svg-child-component-declared-namespace/input.html
index 536f47107e..4e72c96fbe 100644
--- a/test/validator/samples/svg-child-component-declared-namespace/input.html
+++ b/test/validator/samples/svg-child-component-declared-namespace/input.html
@@ -1,7 +1,10 @@
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+<svelte:meta namespace="svg"/>
 
 <script>
-	export default {
-		namespace: 'svg'
-	};
+	export let x;
+	export let y;
+	export let width;
+	export let height;
 </script>
+
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
diff --git a/test/validator/samples/unused-components/input.html b/test/validator/samples/unused-components/input.html
index db1ba9f4c0..0b4e0cd5a8 100644
--- a/test/validator/samples/unused-components/input.html
+++ b/test/validator/samples/unused-components/input.html
@@ -1,11 +1,4 @@
 <script>
 	import Foo from './Foo.html';
 	import Bar from './Bar.html';
-
-	export default {
-		components: {
-			Foo,
-			Bar
-		}
-	};
 </script>
\ No newline at end of file
diff --git a/test/validator/samples/unused-event/input.html b/test/validator/samples/unused-event/input.html
index b759d37749..8e712d009a 100644
--- a/test/validator/samples/unused-event/input.html
+++ b/test/validator/samples/unused-event/input.html
@@ -1,9 +1,5 @@
 <script>
-	export default {
-		events: {
-			drag: (node, callback) => {
-				// implementation goes here
-			}
-		}
+	const drag = (node, callback) => {
+		// implementation goes here
 	};
 </script>
\ No newline at end of file
diff --git a/test/validator/samples/unused-helper/input.html b/test/validator/samples/unused-helper/input.html
index f948e195a3..3fafcb5f5b 100644
--- a/test/validator/samples/unused-helper/input.html
+++ b/test/validator/samples/unused-helper/input.html
@@ -1,7 +1,3 @@
 <script>
-	export default {
-		helpers: {
-			uppercase: x => x.toUpperCase()
-		}
-	};
+	const uppercase = x => x.toUpperCase();
 </script>
\ No newline at end of file
diff --git a/test/validator/samples/unused-transition/input.html b/test/validator/samples/unused-transition/input.html
index 4ddbc200e8..b492401df4 100644
--- a/test/validator/samples/unused-transition/input.html
+++ b/test/validator/samples/unused-transition/input.html
@@ -1,9 +1,5 @@
 <script>
-	export default {
-		transitions: {
-			spin: node => {
-				// implementation goes here
-			}
-		}
+	const spin = node => {
+		// implementation goes here
 	};
 </script>
\ No newline at end of file
diff --git a/test/validator/samples/window-event-invalid/input.html b/test/validator/samples/window-event-invalid/input.html
index b3ec7ceabd..7794cfbb7b 100644
--- a/test/validator/samples/window-event-invalid/input.html
+++ b/test/validator/samples/window-event-invalid/input.html
@@ -1 +1 @@
-<svelte:window on:resize='resize()'/>
\ No newline at end of file
+<svelte:window on:resize='{resize}'/>
\ No newline at end of file