diff --git a/tests/ref/code/for.png b/tests/ref/code/for.png
index f9abf0741..de1f3cabd 100644
Binary files a/tests/ref/code/for.png and b/tests/ref/code/for.png differ
diff --git a/tests/ref/code/if.png b/tests/ref/code/if.png
index b30e63f88..48152e232 100644
Binary files a/tests/ref/code/if.png and b/tests/ref/code/if.png differ
diff --git a/tests/ref/code/invalid.png b/tests/ref/code/invalid.png
deleted file mode 100644
index bfd3ec2cf..000000000
Binary files a/tests/ref/code/invalid.png and /dev/null differ
diff --git a/tests/ref/code/let.png b/tests/ref/code/let.png
index 8a5c5fc68..ae360b6b6 100644
Binary files a/tests/ref/code/let.png and b/tests/ref/code/let.png differ
diff --git a/tests/ref/code/while.png b/tests/ref/code/while.png
index c0045350e..a772fd590 100644
Binary files a/tests/ref/code/while.png and b/tests/ref/code/while.png differ
diff --git a/tests/typ/code/for.typ b/tests/typ/code/for.typ
index bca1af468..321b08cf5 100644
--- a/tests/typ/code/for.typ
+++ b/tests/typ/code/for.typ
@@ -57,6 +57,8 @@
 #test(type(for v in () []), "template")
 
 ---
+// Ref: false
+
 // Uniterable expression.
 // Error: 11-15 cannot loop over boolean
 #for v in true {}
@@ -69,3 +71,36 @@
 #test(error, for v in (1, 2, 3) {
     if v < 2 [Ok] else {error}
 })
+
+---
+// Error: 5 expected identifier
+#for
+
+// Error: 5 expected identifier
+{for}
+
+// Error: 7 expected keyword `in`
+#for v
+
+// Error: 10 expected expression
+#for v in
+
+// Error: 15 expected body
+#for v in iter
+
+// Should output `v in iter`.
+// Error: 5 expected identifier
+#for
+v in iter {}
+
+// Should output `A thing`.
+// Error: 7-10 expected identifier, found string
+A#for "v" thing
+
+// Should output `in iter`.
+// Error: 6-9 expected identifier, found string
+#for "v" in iter {}
+
+// Should output `+ b in iter`.
+// Error: 7 expected keyword `in`
+#for a + b in iter {}
diff --git a/tests/typ/code/if.typ b/tests/typ/code/if.typ
index 8d07e9b82..dd5d23a06 100644
--- a/tests/typ/code/if.typ
+++ b/tests/typ/code/if.typ
@@ -61,6 +61,8 @@
 }
 
 ---
+// Ref: false
+
 // Condition must be boolean.
 // If it isn't, neither branch is evaluated.
 // Error: 5-14 expected boolean, found string
@@ -69,3 +71,29 @@
 // Make sure that we don't complain twice.
 // Error: 5-12 cannot add integer and string
 #if 1 + "2" {}
+
+---
+// Error: 4 expected expression
+#if
+
+// Error: 4 expected expression
+{if}
+
+// Error: 6 expected body
+#if x
+
+// Error: 1-6 unexpected keyword `else`
+#else {}
+
+// Should output `x`.
+// Error: 4 expected expression
+#if
+x {}
+
+// Should output `something`.
+// Error: 6 expected body
+#if x something
+
+// Should output `A thing.`
+// Error: 20 expected body
+A#if false {} #else thing
diff --git a/tests/typ/code/invalid.typ b/tests/typ/code/invalid.typ
deleted file mode 100644
index 49158a688..000000000
--- a/tests/typ/code/invalid.typ
+++ /dev/null
@@ -1,100 +0,0 @@
-// Test invalid control syntax.
-
----
-// Error: 5 expected identifier
-#let
-
-// Error: 5 expected identifier
-{let}
-
-// Error: 6-9 expected identifier, found string
-#let "v"
-
-// Should output `1`.
-// Error: 7 expected semicolon or line break
-#let v 1
-
-// Error: 9 expected expression
-#let v =
-
-// Should output `= 1`.
-// Error: 6-9 expected identifier, found string
-#let "v" = 1
-
----
-// Error: 4 expected expression
-#if
-
-// Error: 4 expected expression
-{if}
-
-// Error: 6 expected body
-#if x
-
-// Error: 1-6 unexpected keyword `else`
-#else {}
-
-// Should output `x`.
-// Error: 4 expected expression
-#if
-x {}
-
-// Should output `something`.
-// Error: 6 expected body
-#if x something
-
-// Should output `A thing.`
-// Error: 20 expected body
-A#if false {} #else thing
-
----
-// Error: 7 expected expression
-#while
-
-// Error: 7 expected expression
-{while}
-
-// Error: 9 expected body
-#while x
-
-// Should output `x`.
-// Error: 7 expected expression
-#while
-x {}
-
-// Should output `something`.
-// Error: 9 expected body
-#while x something
-
----
-// Error: 5 expected identifier
-#for
-
-// Error: 5 expected identifier
-{for}
-
-// Error: 7 expected keyword `in`
-#for v
-
-// Error: 10 expected expression
-#for v in
-
-// Error: 15 expected body
-#for v in iter
-
-// Should output `v in iter`.
-// Error: 5 expected identifier
-#for
-v in iter {}
-
-// Should output `A thing`.
-// Error: 7-10 expected identifier, found string
-A#for "v" thing
-
-// Should output `in iter`.
-// Error: 6-9 expected identifier, found string
-#for "v" in iter {}
-
-// Should output `+ b in iter`.
-// Error: 7 expected keyword `in`
-#for a + b in iter {}
diff --git a/tests/typ/code/let.typ b/tests/typ/code/let.typ
index 49abec531..1a0bb10ea 100644
--- a/tests/typ/code/let.typ
+++ b/tests/typ/code/let.typ
@@ -61,3 +61,24 @@ Three
 #test(v3, 3)
 #test(v4, 4)
 #test(v5, (1, 2))
+
+---
+// Error: 5 expected identifier
+#let
+
+// Error: 5 expected identifier
+{let}
+
+// Error: 6-9 expected identifier, found string
+#let "v"
+
+// Should output `1`.
+// Error: 7 expected semicolon or line break
+#let v 1
+
+// Error: 9 expected expression
+#let v =
+
+// Should output `= 1`.
+// Error: 6-9 expected identifier, found string
+#let "v" = 1
diff --git a/tests/typ/code/assoc.typ b/tests/typ/code/ops-assoc.typ
similarity index 100%
rename from tests/typ/code/assoc.typ
rename to tests/typ/code/ops-assoc.typ
diff --git a/tests/typ/code/prec.typ b/tests/typ/code/ops-prec.typ
similarity index 100%
rename from tests/typ/code/prec.typ
rename to tests/typ/code/ops-prec.typ
diff --git a/tests/typ/code/while.typ b/tests/typ/code/while.typ
index acf7951e3..e55f8f108 100644
--- a/tests/typ/code/while.typ
+++ b/tests/typ/code/while.typ
@@ -22,10 +22,13 @@
 ---
 // Value of while loops.
 // Ref: false
+
 #test(type(while false {}), "template")
 #test(type(while false []), "template")
 
 ---
+// Ref: false
+
 // Condition must be boolean.
 // Error: 8-14 expected boolean, found template
 #while [nope] [nope]
@@ -41,3 +44,22 @@
     if i < 5 [nope] else { error }
 })
 #test(i, 5)
+
+---
+// Error: 7 expected expression
+#while
+
+// Error: 7 expected expression
+{while}
+
+// Error: 9 expected body
+#while x
+
+// Should output `x`.
+// Error: 7 expected expression
+#while
+x {}
+
+// Should output `something`.
+// Error: 9 expected body
+#while x something