diff --git a/test/runtime/samples/dynamic-component-events/main.html b/test/runtime/samples/dynamic-component-events/main.html
index 053d2c8099..68b9551350 100644
--- a/test/runtime/samples/dynamic-component-events/main.html
+++ b/test/runtime/samples/dynamic-component-events/main.html
@@ -6,4 +6,4 @@
 	export let selected;
 </script>
 
-<svelte:component this="{ x ? Foo : Bar }" on:select='{event => selected = event.id}'/>
\ No newline at end of file
+<svelte:component this="{ x ? Foo : Bar }" on:select='{event => selected = event.detail.id}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-in-if/_config.js b/test/runtime/samples/dynamic-component-in-if/_config.js
index 0e087e890e..177fdeb33a 100644
--- a/test/runtime/samples/dynamic-component-in-if/_config.js
+++ b/test/runtime/samples/dynamic-component-in-if/_config.js
@@ -4,9 +4,7 @@ export default {
 	`,
 
 	test(assert, component, target) {
-		const { Bar } = component.get();
-
-		component.x = Bar;
+		component.x = component.Bar;
 
 		assert.htmlEqual(target.innerHTML, `
 			<p>Bar</p>
diff --git a/test/runtime/samples/dynamic-component-nulled-out/_config.js b/test/runtime/samples/dynamic-component-nulled-out/_config.js
index 4c1e497ed2..4ddc9440db 100644
--- a/test/runtime/samples/dynamic-component-nulled-out/_config.js
+++ b/test/runtime/samples/dynamic-component-nulled-out/_config.js
@@ -6,13 +6,13 @@ export default {
 	nestedTransitions: true,
 
 	test(assert, component, target) {
-		const state = component.get();
+		const Foo = component.Foo;
 
 		component.Foo = null;
 
 		assert.htmlEqual(target.innerHTML, ``);
 
-		component.Foo = state.Foo;
+		component.Foo = Foo;
 
 		assert.htmlEqual(target.innerHTML, `
 			<p>Foo</p>
diff --git a/test/runtime/samples/dynamic-component-ref/_config.js b/test/runtime/samples/dynamic-component-ref/_config.js
index 5ab702935b..18169165d8 100644
--- a/test/runtime/samples/dynamic-component-ref/_config.js
+++ b/test/runtime/samples/dynamic-component-ref/_config.js
@@ -2,6 +2,6 @@ export default {
 	html: `Foo`,
 
 	test(assert, component) {
-		assert.ok(component.refs.test);
+		assert.ok(component.test);
 	}
 };
diff --git a/test/runtime/samples/dynamic-component-ref/main.html b/test/runtime/samples/dynamic-component-ref/main.html
index f93af2dffb..cd7b34ed54 100644
--- a/test/runtime/samples/dynamic-component-ref/main.html
+++ b/test/runtime/samples/dynamic-component-ref/main.html
@@ -1,9 +1,7 @@
 <script>
-	export let test;
-
 	import Foo from './Foo.html';
 
-	export let foo = Foo;
+	export let test;
 </script>
 
-<svelte:component this={foo} ref:test/>
+<svelte:component this={Foo} ref:test/>
diff --git a/test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html
deleted file mode 100644
index 7c89b545c5..0000000000
--- a/test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html
+++ /dev/null
@@ -1 +0,0 @@
-<div></div>
diff --git a/test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js b/test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js
deleted file mode 100644
index 31debad5c9..0000000000
--- a/test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default {
-	test(assert, component) {
-		const foo = component.refs.foo;
-		let count = 0;
-
-		foo.on('state', ({ changed }) => {
-			if (changed.foo) count += 1;
-		});
-
-		assert.equal(count, 0);
-
-		component.y = {};
-		assert.equal(count, 0);
-	}
-};
diff --git a/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
deleted file mode 100644
index 4f04a14b89..0000000000
--- a/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-	export let foo;
-
-	import Foo from './Foo.html';
-
-	export let x = {};
-	export let y = {};
-</script>
-
-<Foo ref:foo x='{x}'/>
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
deleted file mode 100644
index dca8ea49ce..0000000000
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-	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/_config.js b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/_config.js
deleted file mode 100644
index f393635572..0000000000
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/_config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default {
-	props: {
-		x: 0,
-		y: 0,
-		width: 100,
-		height: 100
-	},
-
-	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
-
-	test ( assert, component, target ) {
-		const svg = target.querySelector( 'svg' );
-		const rect = target.querySelector( 'rect' );
-
-		assert.equal( svg.namespaceURI, 'http://www.w3.org/2000/svg' );
-		assert.equal( rect.namespaceURI, 'http://www.w3.org/2000/svg' );
-
-		component.width = 150;
-		component.height = 50;
-		assert.equal( target.innerHTML, `<svg><rect x="0" y="0" width="150" height="50"></rect></svg>` );
-	},
-};
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
deleted file mode 100644
index 9e82368dbc..0000000000
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-	import Rect from './Rect.html';
-
-	export let x;
-	export let y;
-	export let width;
-	export let height;
-</script>
-
-<svg>
-	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
-</svg>