diff --git a/test/create/index.js b/test/create/index.js
index cb4beb623a..d88870bf9d 100644
--- a/test/create/index.js
+++ b/test/create/index.js
@@ -3,37 +3,13 @@ import { svelte, deindent } from "../helpers.js";
 
 describe("create", () => {
 	it("should return a component constructor", () => {
-		const source = deindent`
-			<div>{prop}</div>
-		`;
-
-		const component = svelte.create(source);
+		const component = svelte.create(`<div>{prop}</div>`);
 		assert(component instanceof Function);
 	});
 
 	it("should throw error when source is invalid ", done => {
-		const source = deindent`
-			<div>{prop</div>
-		`;
-
-		const component = svelte.create(source, {
-			onerror: () => {
-				done();
-			}
-		});
-
-		assert.equal(component, undefined);
-	});
-
-	it("should return undefined when source is invalid ", () => {
-		const source = deindent`
-			<div>{prop</div>
-		`;
-
-		const component = svelte.create(source, {
-			onerror: () => {}
-		});
-
-		assert.equal(component, undefined);
+		assert.throws(() => {
+			svelte.create(`<div>{prop</div>`);
+		}, /TODO/);
 	});
 });
diff --git a/test/parser/index.js b/test/parser/index.js
index 276cedfcab..3cd7082ec0 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -48,27 +48,6 @@ describe('parse', () => {
 		});
 	});
 
-	// TODO remove in v3
-	it('handles errors with options.onerror', () => {
-		let errored = false;
-
-		svelte.compile(`<h1>unclosed`, {
-			onerror(err) {
-				errored = true;
-				assert.equal(err.message, `<h1> was left open`);
-			}
-		});
-
-		assert.ok(errored);
-	});
-
-	// TODO remove in v3
-	it('throws without options.onerror', () => {
-		assert.throws(() => {
-			svelte.compile(`<h1>unclosed`);
-		}, /<h1> was left open/);
-	});
-
 	it('includes AST in svelte.compile output', () => {
 		const source = fs.readFileSync(`test/parser/samples/attribute-dynamic/input.html`, 'utf-8');
 
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 93c195f9dc..7b9f0ae05d 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -55,6 +55,8 @@ describe.only("runtime", () => {
 
 		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
 
+		if (hydrate && config.skip_if_hydrate) return;
+
 		if (config.solo && process.env.CI) {
 			throw new Error("Forgot to remove `solo: true` from test");
 		}
@@ -74,8 +76,6 @@ describe.only("runtime", () => {
 			compileOptions.shared = internal;
 			compileOptions.hydratable = hydrate;
 			compileOptions.immutable = config.immutable;
-			compileOptions.skipIntroByDefault = config.skipIntroByDefault;
-			compileOptions.nestedTransitions = config.nestedTransitions;
 
 			Object.keys(require.cache)
 				.filter(x => x.endsWith(".html"))
@@ -117,7 +117,7 @@ describe.only("runtime", () => {
 					try {
 						SvelteComponent = require(`./samples/${dir}/main.html`);
 					} catch (err) {
-						showOutput(cwd, { internal, format: 'cjs', hydratable: hydrate, skipIntroByDefault: compileOptions.skipIntroByDefault, nestedTransitions: compileOptions.nestedTransitions }, svelte.compile); // eslint-disable-line no-console
+						showOutput(cwd, { internal, format: 'cjs', hydratable: hydrate }, svelte.compile); // eslint-disable-line no-console
 						throw err;
 					}
 
@@ -183,8 +183,6 @@ describe.only("runtime", () => {
 							internal,
 							format: 'cjs',
 							hydratable: hydrate,
-							skipIntroByDefault: compileOptions.skipIntroByDefault,
-							nestedTransitions: compileOptions.nestedTransitions,
 							dev: compileOptions.dev
 						}, svelte.compile); // eslint-disable-line no-console
 						throw err;
@@ -195,9 +193,7 @@ describe.only("runtime", () => {
 						showOutput(cwd, {
 							internal,
 							format: 'cjs',
-							hydratable: hydrate,
-							skipIntroByDefault: compileOptions.skipIntroByDefault,
-							nestedTransitions: compileOptions.nestedTransitions
+							hydratable: hydrate
 						}, svelte.compile);
 					}
 
diff --git a/test/runtime/samples/dynamic-component-destroy-null/_config.js b/test/runtime/samples/dynamic-component-destroy-null/_config.js
index 32a5e62677..0ccea5de09 100644
--- a/test/runtime/samples/dynamic-component-destroy-null/_config.js
+++ b/test/runtime/samples/dynamic-component-destroy-null/_config.js
@@ -3,8 +3,6 @@ export default {
 		x: true
 	},
 
-	nestedTransitions: true,
-
 	test(assert, component) {
 		component.x = false;
 	}
diff --git a/test/runtime/samples/dynamic-component-nulled-out/_config.js b/test/runtime/samples/dynamic-component-nulled-out/_config.js
index fa69d38b88..2ed4398725 100644
--- a/test/runtime/samples/dynamic-component-nulled-out/_config.js
+++ b/test/runtime/samples/dynamic-component-nulled-out/_config.js
@@ -3,8 +3,6 @@ export default {
 		<p>Foo</p>
 	`,
 
-	nestedTransitions: true,
-
 	test(assert, component, target) {
 		const Bar = component.Bar;
 
diff --git a/test/runtime/samples/each-block-else-mount-or-intro/_config.js b/test/runtime/samples/each-block-else-mount-or-intro/_config.js
index 11aeaa5d45..8460a4b5e0 100644
--- a/test/runtime/samples/each-block-else-mount-or-intro/_config.js
+++ b/test/runtime/samples/each-block-else-mount-or-intro/_config.js
@@ -1,5 +1,4 @@
 export default {
-	nestedTransitions: true,
 	props: { items: [] },
 	html: `No items.`,
 };
diff --git a/test/runtime/samples/each-block-empty-outro/_config.js b/test/runtime/samples/each-block-empty-outro/_config.js
index cf8aa18153..a40e276610 100644
--- a/test/runtime/samples/each-block-empty-outro/_config.js
+++ b/test/runtime/samples/each-block-empty-outro/_config.js
@@ -10,8 +10,6 @@ export default {
 		</div>
 	`,
 
-	nestedTransitions: true,
-
 	test(assert, component, target) {
 		component.visible = false;
 
diff --git a/test/runtime/samples/if-block-component-without-outro/_config.js b/test/runtime/samples/if-block-component-without-outro/_config.js
index 921418d4ba..00a5818cdb 100644
--- a/test/runtime/samples/if-block-component-without-outro/_config.js
+++ b/test/runtime/samples/if-block-component-without-outro/_config.js
@@ -1,7 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-	nestedTransitions: true,
-
 	props: {
 		foo: true,
 	},
diff --git a/test/runtime/samples/if-block-else-partial-outro/_config.js b/test/runtime/samples/if-block-else-partial-outro/_config.js
index 5669eeec50..067c09ebf9 100644
--- a/test/runtime/samples/if-block-else-partial-outro/_config.js
+++ b/test/runtime/samples/if-block-else-partial-outro/_config.js
@@ -8,8 +8,6 @@ export default {
 		<span>1</span>
 	`,
 
-	nestedTransitions: true,
-
 	test(assert, component, target) {
 		component.x = 2;
 		assert.htmlEqual(target.innerHTML, `
diff --git a/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js b/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js
index a536541c1a..66b1bb6cd7 100644
--- a/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js
+++ b/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js
@@ -1,6 +1,4 @@
 export default {
-	nestedTransitions: true,
-
 	html: `
 		<div>A wild component appears</div>
 		<p>x</p>
diff --git a/test/runtime/samples/if-block-outro-nested-else/_config.js b/test/runtime/samples/if-block-outro-nested-else/_config.js
index 153afd2745..d23e448e68 100644
--- a/test/runtime/samples/if-block-outro-nested-else/_config.js
+++ b/test/runtime/samples/if-block-outro-nested-else/_config.js
@@ -1,7 +1,5 @@
 export default {
-	nestedTransitions: true,
-
-	test ( assert, component, target ) {
+	test(assert, component, target) {
 		// Would cause "TypeError: Cannot read property 'o' of undefined"
 		component.foo = false;
 	}
diff --git a/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js b/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
index f3cbb42e25..b94da1a576 100644
--- a/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
+++ b/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
@@ -1,5 +1,4 @@
 export default {
-	nestedTransitions: true,
 	html: `
 		<div></div>
 		<div></div>
diff --git a/test/runtime/samples/nested-transition-detach-each/_config.js b/test/runtime/samples/nested-transition-detach-each/_config.js
index a226e098d9..28e8715c47 100644
--- a/test/runtime/samples/nested-transition-detach-each/_config.js
+++ b/test/runtime/samples/nested-transition-detach-each/_config.js
@@ -8,9 +8,7 @@ export default {
 	html: ``,
 
 	compileOptions: {
-		dev: true,
-		nestedTransitions: true,
-		skipIntroByDefault: true,
+		dev: true
 	},
 
 	test(assert, component, target, window, raf) {
diff --git a/test/runtime/samples/nested-transition-detach-if-false/_config.js b/test/runtime/samples/nested-transition-detach-if-false/_config.js
index de4ff2fe9f..91ed845b43 100644
--- a/test/runtime/samples/nested-transition-detach-if-false/_config.js
+++ b/test/runtime/samples/nested-transition-detach-if-false/_config.js
@@ -13,8 +13,6 @@ export default {
 		</li>
 	`,
 
-	nestedTransitions: true,
-
 	test(assert, component, target, window, raf) {
 		component.folder.open = false;
 		assert.htmlEqual(target.innerHTML, `
diff --git a/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js b/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js
index 16c762537a..dd87b6cb4e 100644
--- a/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js
+++ b/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js
@@ -11,8 +11,6 @@ export default {
 		</div>
 	`,
 
-	nestedTransitions: true,
-
 	test(assert, component, target, window, raf) {
 		const div = target.querySelector('div');
 		const { appendChild, insertBefore } = div;
diff --git a/test/runtime/samples/transition-js-context/_config.js b/test/runtime/samples/transition-js-context/_config.js
index 58a3c56ae9..2d8d92ce87 100644
--- a/test/runtime/samples/transition-js-context/_config.js
+++ b/test/runtime/samples/transition-js-context/_config.js
@@ -1,7 +1,7 @@
 export default {
-	intro: true,
-
 	test(assert, component, target, window, raf) {
+		component.visible = true;
+
 		const div = target.querySelector('div');
 		assert.equal(div.foo, 42);
 
diff --git a/test/runtime/samples/transition-js-context/main.html b/test/runtime/samples/transition-js-context/main.html
index ae98ae5b45..d56ca61a6f 100644
--- a/test/runtime/samples/transition-js-context/main.html
+++ b/test/runtime/samples/transition-js-context/main.html
@@ -1,5 +1,6 @@
 <script>
 	export let x = 42;
+	export let visible = false;
 
 	function foo(node, params) {
 		return {
@@ -11,4 +12,6 @@
 	}
 </script>
 
-<div transition:foo></div>
\ No newline at end of file
+{#if visible}
+	<div transition:foo></div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-destroyed-before-end/_config.js b/test/runtime/samples/transition-js-destroyed-before-end/_config.js
index 23fb1f8626..5f360eb1e9 100644
--- a/test/runtime/samples/transition-js-destroyed-before-end/_config.js
+++ b/test/runtime/samples/transition-js-destroyed-before-end/_config.js
@@ -1,6 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-
 	props: {
 		visible: true
 	},
diff --git a/test/runtime/samples/transition-js-dynamic-component/_config.js b/test/runtime/samples/transition-js-dynamic-component/_config.js
index 87449f43fc..276194593b 100644
--- a/test/runtime/samples/transition-js-dynamic-component/_config.js
+++ b/test/runtime/samples/transition-js-dynamic-component/_config.js
@@ -1,7 +1,4 @@
 export default {
-	nestedTransitions: true,
-	skipIntroByDefault: true,
-
 	props: {
 		x: true,
 	},
diff --git a/test/runtime/samples/transition-js-initial/_config.js b/test/runtime/samples/transition-js-initial/_config.js
index 496b86ed77..b22099cd17 100644
--- a/test/runtime/samples/transition-js-initial/_config.js
+++ b/test/runtime/samples/transition-js-initial/_config.js
@@ -1,7 +1,7 @@
 export default {
-	intro: true,
-
 	test(assert, component, target, window, raf) {
+		component.visible = true;
+
 		const div = target.querySelector('div');
 		assert.equal(div.foo, 0);
 
diff --git a/test/runtime/samples/transition-js-initial/main.html b/test/runtime/samples/transition-js-initial/main.html
index 64d17e0db3..848055f663 100644
--- a/test/runtime/samples/transition-js-initial/main.html
+++ b/test/runtime/samples/transition-js-initial/main.html
@@ -1,4 +1,6 @@
 <script>
+	export let visible = false;
+
 	function foo(node, params) {
 		return {
 			duration: 100,
@@ -9,4 +11,6 @@
 	}
 </script>
 
-<div transition:foo></div>
\ No newline at end of file
+{#if visible}
+	<div transition:foo></div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js b/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js
index f3124450dc..a846036c83 100644
--- a/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js
+++ b/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js
@@ -1,7 +1,8 @@
 export default {
-	skipIntroByDefault: true,
 	intro: true,
 
+	skip_if_hydrate: true,
+
 	test(assert, component, target, window, raf) {
 		const div = target.querySelector('div');
 		assert.equal(div.foo, 0);
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js
index 9e63e6c8f7..4a7a35ebdf 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js
@@ -1,6 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-
 	test(assert, component, target, window, raf) {
 		const div = target.querySelector('div');
 		assert.equal(div.foo, undefined);
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js b/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js
index 9e63e6c8f7..4a7a35ebdf 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js
@@ -1,6 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-
 	test(assert, component, target, window, raf) {
 		const div = target.querySelector('div');
 		assert.equal(div.foo, undefined);
diff --git a/test/runtime/samples/transition-js-nested-await/_config.js b/test/runtime/samples/transition-js-nested-await/_config.js
index e67f103579..e1a144bf0b 100644
--- a/test/runtime/samples/transition-js-nested-await/_config.js
+++ b/test/runtime/samples/transition-js-nested-await/_config.js
@@ -5,9 +5,6 @@ const promise = new Promise(f => {
 });
 
 export default {
-	skipIntroByDefault: true,
-	nestedTransitions: true,
-
 	props: {
 		x: false,
 		promise
diff --git a/test/runtime/samples/transition-js-nested-component/_config.js b/test/runtime/samples/transition-js-nested-component/_config.js
index 91ef642ab2..68ebeb575c 100644
--- a/test/runtime/samples/transition-js-nested-component/_config.js
+++ b/test/runtime/samples/transition-js-nested-component/_config.js
@@ -1,7 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-	nestedTransitions: true,
-
 	props: {
 		x: false
 	},
diff --git a/test/runtime/samples/transition-js-nested-each-delete/_config.js b/test/runtime/samples/transition-js-nested-each-delete/_config.js
index 4b8f2ad8fa..7910eec74c 100644
--- a/test/runtime/samples/transition-js-nested-each-delete/_config.js
+++ b/test/runtime/samples/transition-js-nested-each-delete/_config.js
@@ -1,7 +1,4 @@
 export default {
-	nestedTransitions: true,
-	skipIntroByDefault: true,
-
 	props: {
 		visible: true,
 		things: [ 'a', 'b', 'c' ]
diff --git a/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js b/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js
index 1d2d7c798d..1e0ad7e99f 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js
+++ b/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js
@@ -1,6 +1,4 @@
 export default {
-	nestedTransitions: true,
-
 	props: {
 		x: true,
 		things: ['a', 'b']
diff --git a/test/runtime/samples/transition-js-nested-each-keyed/_config.js b/test/runtime/samples/transition-js-nested-each-keyed/_config.js
index 2e4f8e4bb9..ecc21b5406 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed/_config.js
+++ b/test/runtime/samples/transition-js-nested-each-keyed/_config.js
@@ -1,7 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-	nestedTransitions: true,
-
 	props: {
 		x: false,
 		things: ['a']
diff --git a/test/runtime/samples/transition-js-nested-each/_config.js b/test/runtime/samples/transition-js-nested-each/_config.js
index 2e4f8e4bb9..ecc21b5406 100644
--- a/test/runtime/samples/transition-js-nested-each/_config.js
+++ b/test/runtime/samples/transition-js-nested-each/_config.js
@@ -1,7 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-	nestedTransitions: true,
-
 	props: {
 		x: false,
 		things: ['a']
diff --git a/test/runtime/samples/transition-js-nested-if/_config.js b/test/runtime/samples/transition-js-nested-if/_config.js
index 9a5d09fdec..54d1a68bf5 100644
--- a/test/runtime/samples/transition-js-nested-if/_config.js
+++ b/test/runtime/samples/transition-js-nested-if/_config.js
@@ -1,7 +1,4 @@
 export default {
-	skipIntroByDefault: true,
-	nestedTransitions: true,
-
 	props: {
 		x: false,
 		y: true