diff --git a/test/css/samples/cascade-false-nested/input.html b/test/css/samples/cascade-false-nested/input.html
index a71a9a497c..525860acbe 100644
--- a/test/css/samples/cascade-false-nested/input.html
+++ b/test/css/samples/cascade-false-nested/input.html
@@ -3,7 +3,7 @@
 </span>
 
 <span class='foo'>
-	<span class='bar'>{{dynamic}}</span>
+	<span class='bar'>{dynamic}</span>
 </span>
 
 <style>
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.html b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.html
index 7ddd680b27..dda0d98c7c 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.html
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.html
@@ -1,5 +1,5 @@
 <div>
-	<p data-foo='{{dynamic}}'>this is styled</p>
+	<p data-foo='{dynamic}'>this is styled</p>
 	<p data-foo='baz'>this is unstyled</p>
 </div>
 
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 1ef2a1796a..40c8ad0b32 100644
--- a/test/css/samples/omit-scoping-attribute-class-dynamic/input.html
+++ b/test/css/samples/omit-scoping-attribute-class-dynamic/input.html
@@ -1,4 +1,4 @@
-<p class='{{unknown}}'>this is styled</p>
+<p class='{unknown}'>this is styled</p>
 <p class='bar'>this is unstyled</p>
 
 <style>
diff --git a/test/css/samples/omit-scoping-element-uppercase/_config.js b/test/css/samples/omit-scoping-element-uppercase/_config.js
deleted file mode 100644
index aba09bb780..0000000000
--- a/test/css/samples/omit-scoping-element-uppercase/_config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export default {
-	cascade: false,
-
-	warnings: [{
-		code: 'missing-component',
-		message: 'P component is not defined',
-		loc: {
-			line: 2,
-			column: 1
-		},
-		end: {
-			line: 2,
-			column: 22
-		},
-		pos: 7,
-		frame: `
-			1: <div>
-			2:   <P>this is styled</P>
-			     ^
-			3: </div>
-			4:`
-	}]
-};
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-element-uppercase/expected.css b/test/css/samples/omit-scoping-element-uppercase/expected.css
deleted file mode 100644
index 5d8d69ac33..0000000000
--- a/test/css/samples/omit-scoping-element-uppercase/expected.css
+++ /dev/null
@@ -1 +0,0 @@
-p.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-element-uppercase/expected.html b/test/css/samples/omit-scoping-element-uppercase/expected.html
deleted file mode 100644
index 1bc4a66f62..0000000000
--- a/test/css/samples/omit-scoping-element-uppercase/expected.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><p class="svelte-xyz">this is styled</p></div>
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-element-uppercase/input.html b/test/css/samples/omit-scoping-element-uppercase/input.html
deleted file mode 100644
index 96887547a5..0000000000
--- a/test/css/samples/omit-scoping-element-uppercase/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-	<P>this is styled</P>
-</div>
-
-<style>
-	p {
-		color: red;
-	}
-</style>
\ No newline at end of file
diff --git a/test/css/samples/refs-qualified/_config.js b/test/css/samples/refs-qualified/_config.js
index b525fd8f58..832d6fbe02 100644
--- a/test/css/samples/refs-qualified/_config.js
+++ b/test/css/samples/refs-qualified/_config.js
@@ -12,7 +12,7 @@ export default {
 			column: 1,
 			line: 12
 		},
-		pos: 174,
+		pos: 169,
 		frame: `
 			10:   }
 			11:
diff --git a/test/css/samples/refs-qualified/input.html b/test/css/samples/refs-qualified/input.html
index 44ff33a3ce..f23a4f1845 100644
--- a/test/css/samples/refs-qualified/input.html
+++ b/test/css/samples/refs-qualified/input.html
@@ -1,8 +1,8 @@
-{{#if active}}
+{#if active}
 	<button ref:button class='active'>deactivate</button>
-{{else}}
+{:else}
 	<button ref:button>activate</button>
-{{/if}}
+{/if}
 
 <style>
 	ref:button.active {
diff --git a/test/css/samples/spread/input.html b/test/css/samples/spread/input.html
index d55b90a62f..ab5f2e937e 100644
--- a/test/css/samples/spread/input.html
+++ b/test/css/samples/spread/input.html
@@ -1,4 +1,4 @@
-<div {{...props}} >
+<div {...props} >
 	Big red Comic Sans
 </div>
 
diff --git a/test/css/samples/unused-selector-ternary/_config.js b/test/css/samples/unused-selector-ternary/_config.js
index 7b1ce0c305..31e93bd177 100644
--- a/test/css/samples/unused-selector-ternary/_config.js
+++ b/test/css/samples/unused-selector-ternary/_config.js
@@ -13,7 +13,7 @@ export default {
 			line: 12,
 			column: 1
 		},
-		pos: 125,
+		pos: 123,
 		frame: `
 			10:   }
 			11:
diff --git a/test/css/samples/unused-selector-ternary/input.html b/test/css/samples/unused-selector-ternary/input.html
index edffee317e..728dfa766a 100644
--- a/test/css/samples/unused-selector-ternary/input.html
+++ b/test/css/samples/unused-selector-ternary/input.html
@@ -1,4 +1,4 @@
-<div class='{{active ? "active": "inactive"}}'></div>
+<div class='{active ? "active": "inactive"}'></div>
 
 <style>
 	.active {