diff --git a/test/runtime/samples/component-events-each/_config.js b/test/runtime/samples/component-events-each/_config.js
index 90750cbd90..6edf8b04f8 100644
--- a/test/runtime/samples/component-events-each/_config.js
+++ b/test/runtime/samples/component-events-each/_config.js
@@ -1,27 +1,30 @@
 export default {
 	props: {
-		items: [ 'a', 'b', 'c' ]
+		items: ['a', 'b', 'c']
 	},
 
 	html: `
-		<div><button>click me</button><button>click me</button><button>click me</button></div>
+		<div>
+			<button>click me</button>
+			<button>click me</button>
+			<button>click me</button>
+		</div>
 	`,
 
-	test ( assert, component, target, window ) {
-		const buttons = target.querySelectorAll( 'button' );
+	test(assert, component, target, window) {
+		const buttons = target.querySelectorAll('button');
 
 		const clicks = [];
 
-		component.on( 'foo', item => {
-			clicks.push( item );
+		component.$on('foo', event => {
+			clicks.push(event.detail);
 		});
 
-		const event = new window.MouseEvent( 'click' );
+		const event = new window.MouseEvent('click');
 
-		buttons[0].dispatchEvent( event );
-		buttons[2].dispatchEvent( event );
+		buttons[0].dispatchEvent(event);
+		buttons[2].dispatchEvent(event);
 
-		assert.deepEqual( clicks, [ 'a', 'c' ]);
-		component.destroy();
+		assert.deepEqual(clicks, ['a', 'c']);
 	}
 };
diff --git a/test/runtime/samples/component-events-each/main.html b/test/runtime/samples/component-events-each/main.html
index da9f69b381..4a5a694172 100644
--- a/test/runtime/samples/component-events-each/main.html
+++ b/test/runtime/samples/component-events-each/main.html
@@ -1,10 +1,13 @@
 <script>
 	import Widget from './Widget.html';
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
 
 	export let items;
 
 	function foo(item) {
-		dispatch( 'foo', item );
+		dispatch('foo', item);
 	}
 </script>
 
diff --git a/test/runtime/samples/computed-empty/_config.js b/test/runtime/samples/computed-empty/_config.js
deleted file mode 100644
index 97678fd18c..0000000000
--- a/test/runtime/samples/computed-empty/_config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-	html: '<div>empty</div>',
-	test ( assert, component, target ) {
-		assert.equal( component.created, true );
-		assert.equal( target.innerHTML, '<div>empty</div>' );
-		component.destroy();
-	}
-};
diff --git a/test/runtime/samples/computed-empty/main.html b/test/runtime/samples/computed-empty/main.html
deleted file mode 100644
index d11d41fa35..0000000000
--- a/test/runtime/samples/computed-empty/main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	import { onmount } from 'svelte';
-
-	onmount(() => {
-		created = true;
-	});
-</script>
-
-<div>empty</div>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-function/_config.js b/test/runtime/samples/computed-function/_config.js
index 9d1fdbf960..5798a1e4da 100644
--- a/test/runtime/samples/computed-function/_config.js
+++ b/test/runtime/samples/computed-function/_config.js
@@ -1,14 +1,14 @@
 export default {
 	html: '<p>50</p>',
 
-	test ( assert, component, target ) {
-		component.range = [ 50, 100 ];
-		assert.htmlEqual( target.innerHTML, '<p>75</p>' );
+	test(assert, component, target) {
+		component.range = [50, 100];
+		assert.htmlEqual(target.innerHTML, '<p>75</p>');
 
-		component.range = [ 50, 60 ];
-		assert.htmlEqual( target.innerHTML, '<p>55</p>' );
+		component.range = [50, 60];
+		assert.htmlEqual(target.innerHTML, '<p>55</p>');
 
 		component.x = 8;
-		assert.htmlEqual( target.innerHTML, '<p>58</p>' );
+		assert.htmlEqual(target.innerHTML, '<p>58</p>');
 	}
 };
diff --git a/test/runtime/samples/computed-function/main.html b/test/runtime/samples/computed-function/main.html
index 00a0a83c6a..6c57992ee4 100644
--- a/test/runtime/samples/computed-function/main.html
+++ b/test/runtime/samples/computed-function/main.html
@@ -1,12 +1,12 @@
 <script>
-	export let domain = [ 0, 10 ];
-	export let range = [ 0, 100 ];
+	export let domain = [0, 10];
+	export let range = [0, 100];
 	export let x = 5;
 
 	function scale() {
 		return num => {
-			const t = domain[0] + ( num - domain[0] ) / ( domain[1] - domain[0] );
-			return range[0] + t * ( range[1] - range[0] );
+			const t = domain[0] + (num - domain[0]) / (domain[1] - domain[0]);
+			return range[0] + t * (range[1] - range[0]);
 		}
 	}
 </script>
diff --git a/test/runtime/samples/computed-values-default/_config.js b/test/runtime/samples/computed-values-default/_config.js
deleted file mode 100644
index 83f790588f..0000000000
--- a/test/runtime/samples/computed-values-default/_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default {
-	html: '<p>2</p>',
-
-	'skip-ssr': /^v4/.test( process.version ), // we're not transpiling server-side tests in Node 4, because it's tricky
-
-	test ( assert, component, target ) {
-		component.a = 2;
-		assert.equal( target.innerHTML, '<p>4</p>' );
-		component.destroy();
-	}
-};
diff --git a/test/runtime/samples/computed-values-default/main.html b/test/runtime/samples/computed-values-default/main.html
deleted file mode 100644
index b26762f3d8..0000000000
--- a/test/runtime/samples/computed-values-default/main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>{foo}</p>
-
-<script>
-	export default {
-		computed: {
-			foo: ({ a = 1 }) => a * 2
-		}
-	};
-</script>
diff --git a/test/runtime/samples/computed-values-function-dependency/_config.js b/test/runtime/samples/computed-values-function-dependency/_config.js
index 16662dc066..329182d17d 100644
--- a/test/runtime/samples/computed-values-function-dependency/_config.js
+++ b/test/runtime/samples/computed-values-function-dependency/_config.js
@@ -1,10 +1,10 @@
 export default {
 	html: '<p>2</p>',
 
-	test ( assert, component, target ) {
+	test(assert, component, target) {
 		component.y = 2;
-		assert.equal( component.x, 4 );
-		assert.equal( target.innerHTML, '<p>4</p>' );
+		assert.equal(component.x, 4);
+		assert.equal(target.innerHTML, '<p>4</p>');
 		component.destroy();
 	}
 };
diff --git a/test/runtime/samples/computed-values/_config.js b/test/runtime/samples/computed-values/_config.js
index f931754cb5..2aa22ccbfd 100644
--- a/test/runtime/samples/computed-values/_config.js
+++ b/test/runtime/samples/computed-values/_config.js
@@ -1,10 +1,11 @@
 export default {
 	html: '<p>1 + 2 = 3</p>\n<p>3 * 3 = 9</p>',
-	test ( assert, component, target ) {
+
+	test(assert, component, target) {
 		component.a = 3;
-		assert.equal( component.c, 5 );
-		assert.equal( component.cSquared, 25 );
-		assert.equal( target.innerHTML, '<p>3 + 2 = 5</p>\n<p>5 * 5 = 25</p>' );
+		assert.equal(component.c, 5);
+		assert.equal(component.cSquared, 25);
+		assert.equal(target.innerHTML, '<p>3 + 2 = 5</p>\n<p>5 * 5 = 25</p>');
 		component.destroy();
 	}
 };
diff --git a/test/runtime/samples/each-block-containing-if/_config.js b/test/runtime/samples/each-block-containing-if/_config.js
index b6664df190..d8e279a2ab 100644
--- a/test/runtime/samples/each-block-containing-if/_config.js
+++ b/test/runtime/samples/each-block-containing-if/_config.js
@@ -1,12 +1,12 @@
 export default {
-	test ( assert, component, target ) {
+	test(assert, component, target) {
 		const items = component.items;
-		items.forEach( item => item.completed = false );
+		items.forEach(item => item.completed = false);
 
 		component.currentFilter = 'all';
 
-		assert.htmlEqual( target.innerHTML, `
-			<ul><li>one</li><li>two</li><li>three</li></ul>`
-		);
+		assert.htmlEqual(target.innerHTML, `
+			<ul><li>one</li><li>two</li><li>three</li></ul>
+		`);
 	}
 };
diff --git a/test/runtime/samples/each-block-else-starts-empty/_config.js b/test/runtime/samples/each-block-else-starts-empty/_config.js
index aec860edc0..d4d4b46f85 100644
--- a/test/runtime/samples/each-block-else-starts-empty/_config.js
+++ b/test/runtime/samples/each-block-else-starts-empty/_config.js
@@ -10,12 +10,12 @@ export default {
 		after
 	`,
 
-	test ( assert, component, target ) {
+	test(assert, component, target) {
 		component.animals = ['wombat'];
-		assert.htmlEqual( target.innerHTML, `
+		assert.htmlEqual(target.innerHTML, `
 			before
 			<p>wombat</p>
 			after
-		` );
+		`);
 	}
 };