diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js
index d2dda757ef..ae148c67cc 100644
--- a/test/js/samples/collapses-text-around-comments/expected-bundle.js
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -153,6 +153,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -162,7 +170,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 var template = (function () {
diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
index 2ebbbcb13d..af71c37d15 100644
--- a/test/js/samples/computed-collapsed-if/expected-bundle.js
+++ b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -129,6 +129,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -138,7 +146,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 var template = (function () {
diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js
index afcf12bb19..d743041461 100644
--- a/test/js/samples/css-media-query/expected-bundle.js
+++ b/test/js/samples/css-media-query/expected-bundle.js
@@ -149,6 +149,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -158,7 +166,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function encapsulateStyles ( node ) {
diff --git a/test/js/samples/custom-element-basic/expected-bundle.js b/test/js/samples/custom-element-basic/expected-bundle.js
index 77a7b3bc0f..876bff4ece 100644
--- a/test/js/samples/custom-element-basic/expected-bundle.js
+++ b/test/js/samples/custom-element-basic/expected-bundle.js
@@ -149,6 +149,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -158,7 +166,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
@@ -238,7 +248,15 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define('custom-element', SvelteComponent);
-
-assign( SvelteComponent.prototype, proto );
+assign( SvelteComponent.prototype, proto , {
+	_mount(target, anchor) {
+		this._fragment.mount(this.shadowRoot, null);
+		target.insertBefore(this, anchor);
+	},
+
+	_unmount() {
+		this.parentNode.removeChild(this);
+	}
+});
 
 export default SvelteComponent;
diff --git a/test/js/samples/custom-element-basic/expected.js b/test/js/samples/custom-element-basic/expected.js
index 21437ee293..82dc7f2bb5 100644
--- a/test/js/samples/custom-element-basic/expected.js
+++ b/test/js/samples/custom-element-basic/expected.js
@@ -77,7 +77,15 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define('custom-element', SvelteComponent);
-
-assign( SvelteComponent.prototype, proto );
+assign( SvelteComponent.prototype, proto , {
+	_mount(target, anchor) {
+		this._fragment.mount(this.shadowRoot, null);
+		target.insertBefore(this, anchor);
+	},
+
+	_unmount() {
+		this.parentNode.removeChild(this);
+	}
+});
 
 export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/custom-element-slot/expected-bundle.js b/test/js/samples/custom-element-slot/expected-bundle.js
index 78011c2cb6..8ec67565ce 100644
--- a/test/js/samples/custom-element-slot/expected-bundle.js
+++ b/test/js/samples/custom-element-slot/expected-bundle.js
@@ -153,6 +153,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -162,7 +170,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
@@ -245,7 +255,15 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define('custom-element', SvelteComponent);
-
-assign( SvelteComponent.prototype, proto );
+assign( SvelteComponent.prototype, proto , {
+	_mount(target, anchor) {
+		this._fragment.mount(this.shadowRoot, null);
+		target.insertBefore(this, anchor);
+	},
+
+	_unmount() {
+		this.parentNode.removeChild(this);
+	}
+});
 
 export default SvelteComponent;
diff --git a/test/js/samples/custom-element-slot/expected.js b/test/js/samples/custom-element-slot/expected.js
index 8b162fa50d..c0e2ef136b 100644
--- a/test/js/samples/custom-element-slot/expected.js
+++ b/test/js/samples/custom-element-slot/expected.js
@@ -80,7 +80,15 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define('custom-element', SvelteComponent);
-
-assign( SvelteComponent.prototype, proto );
+assign( SvelteComponent.prototype, proto , {
+	_mount(target, anchor) {
+		this._fragment.mount(this.shadowRoot, null);
+		target.insertBefore(this, anchor);
+	},
+
+	_unmount() {
+		this.parentNode.removeChild(this);
+	}
+});
 
 export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/custom-element-styled/expected-bundle.js b/test/js/samples/custom-element-styled/expected-bundle.js
index 5d2d44f38e..ae41cfcccb 100644
--- a/test/js/samples/custom-element-styled/expected-bundle.js
+++ b/test/js/samples/custom-element-styled/expected-bundle.js
@@ -149,6 +149,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -158,7 +166,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
@@ -211,7 +221,7 @@ class SvelteComponent extends HTMLElement {
 		this._bind = options._bind;
 
 		this.attachShadow({ mode: 'open' });
-		this.shadowRoot.innerHTML = '<style>h1{color:red}</style>';
+		this.shadowRoot.innerHTML = `<style>h1{color:red}</style>`;
 
 		this._fragment = create_main_fragment( this._state, this );
 
@@ -239,7 +249,15 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define('custom-element', SvelteComponent);
-
-assign( SvelteComponent.prototype, proto );
+assign( SvelteComponent.prototype, proto , {
+	_mount(target, anchor) {
+		this._fragment.mount(this.shadowRoot, null);
+		target.insertBefore(this, anchor);
+	},
+
+	_unmount() {
+		this.parentNode.removeChild(this);
+	}
+});
 
 export default SvelteComponent;
diff --git a/test/js/samples/custom-element-styled/expected.js b/test/js/samples/custom-element-styled/expected.js
index ef6a614f00..f0b0e38020 100644
--- a/test/js/samples/custom-element-styled/expected.js
+++ b/test/js/samples/custom-element-styled/expected.js
@@ -50,7 +50,7 @@ class SvelteComponent extends HTMLElement {
 		this._bind = options._bind;
 
 		this.attachShadow({ mode: 'open' });
-		this.shadowRoot.innerHTML = '<style>h1{color:red}</style>';
+		this.shadowRoot.innerHTML = `<style>h1{color:red}</style>`;
 
 		this._fragment = create_main_fragment( this._state, this );
 
@@ -78,7 +78,15 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define('custom-element', SvelteComponent);
-
-assign( SvelteComponent.prototype, proto );
+assign( SvelteComponent.prototype, proto , {
+	_mount(target, anchor) {
+		this._fragment.mount(this.shadowRoot, null);
+		target.insertBefore(this, anchor);
+	},
+
+	_unmount() {
+		this.parentNode.removeChild(this);
+	}
+});
 
 export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js
index 65e244108a..9f3048a816 100644
--- a/test/js/samples/each-block-changed-check/expected-bundle.js
+++ b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -162,6 +162,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -171,7 +179,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js
index 3edd91e778..472e46c8ac 100644
--- a/test/js/samples/event-handlers-custom/expected-bundle.js
+++ b/test/js/samples/event-handlers-custom/expected-bundle.js
@@ -149,6 +149,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -158,7 +166,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 var template = (function () {
diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
index 141fb94d96..30fcae061a 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -153,6 +153,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -162,7 +170,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
index 7047170311..9ac38ae5fe 100644
--- a/test/js/samples/if-block-simple/expected-bundle.js
+++ b/test/js/samples/if-block-simple/expected-bundle.js
@@ -153,6 +153,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -162,7 +170,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js
index 92bd8c1608..0a2fa851fe 100644
--- a/test/js/samples/legacy-input-type/expected-bundle.js
+++ b/test/js/samples/legacy-input-type/expected-bundle.js
@@ -147,6 +147,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -156,7 +164,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js
index a56d55b6d3..7d90b2cf53 100644
--- a/test/js/samples/non-imported-component/expected-bundle.js
+++ b/test/js/samples/non-imported-component/expected-bundle.js
@@ -143,6 +143,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -152,7 +160,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 var template = (function () {
@@ -182,17 +192,17 @@ function create_main_fragment ( state, component ) {
 		},
 
 		mount: function ( target, anchor ) {
-			imported._fragment.mount( target, anchor );
+			imported._mount( target, anchor );
 			insertNode( text, target, anchor );
-			nonimported._fragment.mount( target, anchor );
+			nonimported._mount( target, anchor );
 		},
 
 		update: noop,
 
 		unmount: function () {
-			imported._fragment.unmount();
+			imported._unmount();
 			detachNode( text );
-			nonimported._fragment.unmount();
+			nonimported._unmount();
 		},
 
 		destroy: function () {
@@ -228,9 +238,7 @@ function SvelteComponent ( options ) {
 	if ( !options._root ) {
 		this._fragment.create();
 		this._fragment.mount( options.target, options.anchor || null );
-	}
 
-	if ( !options._root ) {
 		this._lock = true;
 		callAll(this._beforecreate);
 		callAll(this._oncreate);
diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js
index 1d23ee8f9e..3d5c223e7d 100644
--- a/test/js/samples/non-imported-component/expected.js
+++ b/test/js/samples/non-imported-component/expected.js
@@ -29,17 +29,17 @@ function create_main_fragment ( state, component ) {
 		},
 
 		mount: function ( target, anchor ) {
-			imported._fragment.mount( target, anchor );
+			imported._mount( target, anchor );
 			insertNode( text, target, anchor );
-			nonimported._fragment.mount( target, anchor );
+			nonimported._mount( target, anchor );
 		},
 
 		update: noop,
 
 		unmount: function () {
-			imported._fragment.unmount();
+			imported._unmount();
 			detachNode( text );
-			nonimported._fragment.unmount();
+			nonimported._unmount();
 		},
 
 		destroy: function () {
@@ -75,9 +75,7 @@ function SvelteComponent ( options ) {
 	if ( !options._root ) {
 		this._fragment.create();
 		this._fragment.mount( options.target, options.anchor || null );
-	}
 
-	if ( !options._root ) {
 		this._lock = true;
 		callAll(this._beforecreate);
 		callAll(this._oncreate);
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
index 6d4a4814aa..400cca8ff5 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
@@ -129,6 +129,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -138,7 +146,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 var template = (function () {
@@ -193,9 +203,7 @@ function SvelteComponent ( options ) {
 	if ( !options._root ) {
 		this._fragment.create();
 		this._fragment.mount( options.target, options.anchor || null );
-	}
 
-	if ( !options._root ) {
 		callAll(this._oncreate);
 	}
 }
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected.js b/test/js/samples/onrender-onteardown-rewritten/expected.js
index d19bed1529..02cef79f50 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected.js
@@ -52,9 +52,7 @@ function SvelteComponent ( options ) {
 	if ( !options._root ) {
 		this._fragment.create();
 		this._fragment.mount( options.target, options.anchor || null );
-	}
 
-	if ( !options._root ) {
 		callAll(this._oncreate);
 	}
 }
diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js
index 8f162ec7b5..40e4565a9f 100644
--- a/test/js/samples/setup-method/expected-bundle.js
+++ b/test/js/samples/setup-method/expected-bundle.js
@@ -129,6 +129,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -138,7 +146,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 var template = (function () {
diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js
index 35eec6f965..d8cf0a2ad3 100644
--- a/test/js/samples/use-elements-as-anchors/expected-bundle.js
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -153,6 +153,14 @@ function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
+function _mount(target, anchor) {
+	this._fragment.mount(target, anchor);
+}
+
+function _unmount() {
+	this._fragment.unmount();
+}
+
 var proto = {
 	destroy: destroy,
 	get: get,
@@ -162,7 +170,9 @@ var proto = {
 	set: set,
 	teardown: destroy,
 	_recompute: noop,
-	_set: _set
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount
 };
 
 function create_main_fragment ( state, component ) {