40 files changed, 35 insertions, 36 deletions
diff --git a/tests/ref/expr/array.png b/tests/ref/code/array.png
index b1e20348..b1e20348 100644
--- a/tests/ref/expr/array.png
+++ b/tests/ref/code/array.png
diff --git a/tests/ref/expr/block-invalid.png b/tests/ref/code/block-invalid.png
index d1e85402..d1e85402 100644
--- a/tests/ref/expr/block-invalid.png
+++ b/tests/ref/code/block-invalid.png
diff --git a/tests/ref/expr/block.png b/tests/ref/code/block.png
index 6b0dd540..6b0dd540 100644
--- a/tests/ref/expr/block.png
+++ b/tests/ref/code/block.png
diff --git a/tests/ref/expr/call-invalid.png b/tests/ref/code/call-invalid.png
index f2f90f09..f2f90f09 100644
--- a/tests/ref/expr/call-invalid.png
+++ b/tests/ref/code/call-invalid.png
diff --git a/tests/ref/expr/call.png b/tests/ref/code/call.png
index ae05f617..ae05f617 100644
--- a/tests/ref/expr/call.png
+++ b/tests/ref/code/call.png
diff --git a/tests/ref/comment.png b/tests/ref/code/comment.png
index 6654e125..6654e125 100644
--- a/tests/ref/comment.png
+++ b/tests/ref/code/comment.png
diff --git a/tests/ref/expr/dict.png b/tests/ref/code/dict.png
index 09f69b56..09f69b56 100644
--- a/tests/ref/expr/dict.png
+++ b/tests/ref/code/dict.png
diff --git a/tests/ref/control/for.png b/tests/ref/code/for.png
index f9abf074..f9abf074 100644
--- a/tests/ref/control/for.png
+++ b/tests/ref/code/for.png
diff --git a/tests/ref/control/if.png b/tests/ref/code/if.png
index b30e63f8..b30e63f8 100644
--- a/tests/ref/control/if.png
+++ b/tests/ref/code/if.png
diff --git a/tests/ref/control/invalid.png b/tests/ref/code/invalid.png
index bfd3ec2c..bfd3ec2c 100644
--- a/tests/ref/control/invalid.png
+++ b/tests/ref/code/invalid.png
diff --git a/tests/ref/control/let.png b/tests/ref/code/let.png
index 8a5c5fc6..8a5c5fc6 100644
--- a/tests/ref/control/let.png
+++ b/tests/ref/code/let.png
diff --git a/tests/ref/expr/ops.png b/tests/ref/code/ops.png
index b566b5b7..b566b5b7 100644
--- a/tests/ref/expr/ops.png
+++ b/tests/ref/code/ops.png
diff --git a/tests/ref/repr.png b/tests/ref/code/repr.png
index b93677f1..b93677f1 100644
--- a/tests/ref/repr.png
+++ b/tests/ref/code/repr.png
diff --git a/tests/ref/control/while.png b/tests/ref/code/while.png
index c0045350..c0045350 100644
--- a/tests/ref/control/while.png
+++ b/tests/ref/code/while.png
diff --git a/tests/ref/expand.png b/tests/ref/layout/fixed.png
index e07e15e8..e07e15e8 100644
--- a/tests/ref/expand.png
+++ b/tests/ref/layout/fixed.png
diff --git a/tests/ref/spacing.png b/tests/ref/spacing.png
deleted file mode 100644
index 82f7e8d2..00000000
--- a/tests/ref/spacing.png
+++ /dev/null
diff --git a/tests/ref/text/whitespace.png b/tests/ref/text/whitespace.png
index 35a21320..27a67586 100644
--- a/tests/ref/text/whitespace.png
+++ b/tests/ref/text/whitespace.png
diff --git a/tests/typ/expr/array.typ b/tests/typ/code/array.typ
index c9383501..c9383501 100644
--- a/tests/typ/expr/array.typ
+++ b/tests/typ/code/array.typ
diff --git a/tests/typ/expr/assoc.typ b/tests/typ/code/assoc.typ
index 19c56951..19c56951 100644
--- a/tests/typ/expr/assoc.typ
+++ b/tests/typ/code/assoc.typ
diff --git a/tests/typ/expr/block-invalid.typ b/tests/typ/code/block-invalid.typ
index d98bf06b..d98bf06b 100644
--- a/tests/typ/expr/block-invalid.typ
+++ b/tests/typ/code/block-invalid.typ
diff --git a/tests/typ/expr/block-scoping.typ b/tests/typ/code/block-scoping.typ
index 7bb98969..7bb98969 100644
--- a/tests/typ/expr/block-scoping.typ
+++ b/tests/typ/code/block-scoping.typ
diff --git a/tests/typ/expr/block.typ b/tests/typ/code/block.typ
index 196e6c14..196e6c14 100644
--- a/tests/typ/expr/block.typ
+++ b/tests/typ/code/block.typ
diff --git a/tests/typ/expr/call-invalid.typ b/tests/typ/code/call-invalid.typ
index 0ed5246f..0ed5246f 100644
--- a/tests/typ/expr/call-invalid.typ
+++ b/tests/typ/code/call-invalid.typ
diff --git a/tests/typ/expr/call.typ b/tests/typ/code/call.typ
index dcf11806..dcf11806 100644
--- a/tests/typ/expr/call.typ
+++ b/tests/typ/code/call.typ
diff --git a/tests/typ/expr/closure.typ b/tests/typ/code/closure.typ
index 86a6f632..86a6f632 100644
--- a/tests/typ/expr/closure.typ
+++ b/tests/typ/code/closure.typ
diff --git a/tests/typ/comment.typ b/tests/typ/code/comment.typ
index 25180211..25180211 100644
--- a/tests/typ/comment.typ
+++ b/tests/typ/code/comment.typ
diff --git a/tests/typ/expr/dict.typ b/tests/typ/code/dict.typ
index 655a3299..655a3299 100644
--- a/tests/typ/expr/dict.typ
+++ b/tests/typ/code/dict.typ
diff --git a/tests/typ/control/for-pattern.typ b/tests/typ/code/for-pattern.typ
index a6a7c16a..a6a7c16a 100644
--- a/tests/typ/control/for-pattern.typ
+++ b/tests/typ/code/for-pattern.typ
diff --git a/tests/typ/control/for.typ b/tests/typ/code/for.typ
index bca1af46..bca1af46 100644
--- a/tests/typ/control/for.typ
+++ b/tests/typ/code/for.typ
diff --git a/tests/typ/control/if.typ b/tests/typ/code/if.typ
index 8d07e9b8..8d07e9b8 100644
--- a/tests/typ/control/if.typ
+++ b/tests/typ/code/if.typ
diff --git a/tests/typ/control/invalid.typ b/tests/typ/code/invalid.typ
index 49158a68..49158a68 100644
--- a/tests/typ/control/invalid.typ
+++ b/tests/typ/code/invalid.typ
diff --git a/tests/typ/control/let.typ b/tests/typ/code/let.typ
index 4f84aa67..4f84aa67 100644
--- a/tests/typ/control/let.typ
+++ b/tests/typ/code/let.typ
diff --git a/tests/typ/expr/ops-invalid.typ b/tests/typ/code/ops-invalid.typ
index 12d2a2c3..12d2a2c3 100644
--- a/tests/typ/expr/ops-invalid.typ
+++ b/tests/typ/code/ops-invalid.typ
diff --git a/tests/typ/expr/ops.typ b/tests/typ/code/ops.typ
index ef249c43..ef249c43 100644
--- a/tests/typ/expr/ops.typ
+++ b/tests/typ/code/ops.typ
diff --git a/tests/typ/expr/prec.typ b/tests/typ/code/prec.typ
index e64e583c..e64e583c 100644
--- a/tests/typ/expr/prec.typ
+++ b/tests/typ/code/prec.typ
diff --git a/tests/typ/repr.typ b/tests/typ/code/repr.typ
index f2404510..f2404510 100644
--- a/tests/typ/repr.typ
+++ b/tests/typ/code/repr.typ
diff --git a/tests/typ/control/while.typ b/tests/typ/code/while.typ
index acf7951e..acf7951e 100644
--- a/tests/typ/control/while.typ
+++ b/tests/typ/code/while.typ
diff --git a/tests/typ/expand.typ b/tests/typ/layout/fixed.typ
index 8b858a4e..bcb88fe1 100644
--- a/tests/typ/expand.typ
+++ b/tests/typ/layout/fixed.typ
@@ -1,4 +1,4 @@
-// Test fit/fill expansion.
+// Test shrink-to-fit vs fixed.
 
 ---
 #let right(body) = align(right, body)
diff --git a/tests/typ/spacing.typ b/tests/typ/spacing.typ
deleted file mode 100644
index bb86a59c..00000000
--- a/tests/typ/spacing.typ
+++ /dev/null
@@ -1,35 +0,0 @@
-// Test spacing around control flow structures.
-
----
-// Spacing around let.
-
-// Error: 6 expected identifier
-A#let;B \
-A#let x = 1;B  #test(x, 1) \
-A #let x = 2;B #test(x, 2) \
-A#let x = 3; B #test(x, 3)
-
----
-// Spacing around if-else.
-
-A#if true [B]C \
-A#if true [B] C \
-A #if true{"B"}C \
-A #if true{"B"} C \
-A#if false [] #else [B]C \
-A#if true [B] #else [] C
-
----
-// Spacing around while loop.
-
-#let c = true; A#while c [{c = false}B]C \
-#let c = true; A#while c [{c = false}B] C \
-#let c = true; A #while c { c = false; "B" }C \
-#let c = true; A #while c { c = false; "B" } C
-
----
-// Spacing around for loop.
-
-A#for _ in (none,) [B]C  \
-A#for _ in (none,) [B] C \
-A #for _ in (none,) {"B"}C
diff --git a/tests/typ/text/whitespace.typ b/tests/typ/text/whitespace.typ
index 3d7dd2e2..418c3a12 100644
--- a/tests/typ/text/whitespace.typ
+++ b/tests/typ/text/whitespace.typ
@@ -1,6 +1,40 @@
 // Test whitespace handling.
 
 ---
+// Spacing around let.
+
+// Error: 6 expected identifier
+A#let;B \
+A#let x = 1;B  #test(x, 1) \
+A #let x = 2;B #test(x, 2) \
+A#let x = 3; B #test(x, 3)
+
+---
+// Spacing around if-else.
+
+A#if true [B]C \
+A#if true [B] C \
+A #if true{"B"}C \
+A #if true{"B"} C \
+A#if false [] #else [B]C \
+A#if true [B] #else [] C
+
+---
+// Spacing around while loop.
+
+#let c = true; A#while c [{c = false}B]C \
+#let c = true; A#while c [{c = false}B] C \
+#let c = true; A #while c { c = false; "B" }C \
+#let c = true; A #while c { c = false; "B" } C
+
+---
+// Spacing around for loop.
+
+A#for _ in (none,) [B]C  \
+A#for _ in (none,) [B] C \
+A #for _ in (none,) {"B"}C
+
+---
 // Test that a run consisting only of whitespace isn't trimmed.
 A#font("PT Sans")[ ]B