200 files changed, 135 insertions, 136 deletions

diff --git a/tests/README.md b/tests/README.md
index 7ad0535c..5356cf65 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -3,7 +3,9 @@
 ## Directory structure
 Top level directory structure:
 - `src`: Testing code.
-- `typ`: Input files.
+- `typ`: Input files. The tests in `compiler` specifically test the compiler
+         while the others test the standard library (but also the compiler
+         indirectly).
 - `ref`: Reference images which the output is compared with to determine whether
          a test passed or failed.
 - `png`: PNG files produced by tests.
diff --git a/tests/ref/base/blind.png b/tests/ref/base/blind.png
deleted file mode 100644
index e972567e..00000000
--- a/tests/ref/base/blind.png
+++ /dev/null
diff --git a/tests/ref/base/color.png b/tests/ref/base/color.png
deleted file mode 100644
index 496013bb..00000000
--- a/tests/ref/base/color.png
+++ /dev/null
diff --git a/tests/ref/base/data.png b/tests/ref/base/data.png
deleted file mode 100644
index 69e0ae38..00000000
--- a/tests/ref/base/data.png
+++ /dev/null
diff --git a/tests/ref/base/eval.png b/tests/ref/base/eval.png
deleted file mode 100644
index 38c1d64e..00000000
--- a/tests/ref/base/eval.png
+++ /dev/null
diff --git a/tests/ref/base/numbering.png b/tests/ref/base/numbering.png
deleted file mode 100644
index aa34de29..00000000
--- a/tests/ref/base/numbering.png
+++ /dev/null
diff --git a/tests/ref/basics/desc.png b/tests/ref/basics/desc.png
new file mode 100644
index 00000000..e186ec8c
--- /dev/null
+++ b/tests/ref/basics/desc.png
diff --git a/tests/ref/basics/enum.png b/tests/ref/basics/enum.png
new file mode 100644
index 00000000..0c9c9487
--- /dev/null
+++ b/tests/ref/basics/enum.png
diff --git a/tests/ref/structure/heading.png b/tests/ref/basics/heading.png
index 96ffcb80..96ffcb80 100644
--- a/tests/ref/structure/heading.png
+++ b/tests/ref/basics/heading.png
diff --git a/tests/ref/structure/attach.png b/tests/ref/basics/list-attach.png
index 9b0e4c68..9b0e4c68 100644
--- a/tests/ref/structure/attach.png
+++ b/tests/ref/basics/list-attach.png
diff --git a/tests/ref/structure/list.png b/tests/ref/basics/list.png
index 5d0f03c0..5d0f03c0 100644
--- a/tests/ref/structure/list.png
+++ b/tests/ref/basics/list.png
diff --git a/tests/ref/structure/table.png b/tests/ref/basics/table.png
index f50f613b..f50f613b 100644
--- a/tests/ref/structure/table.png
+++ b/tests/ref/basics/table.png
diff --git a/tests/ref/code/block.png b/tests/ref/code/block.png
deleted file mode 100644
index 9cd0ba36..00000000
--- a/tests/ref/code/block.png
+++ /dev/null
diff --git a/tests/ref/code/if.png b/tests/ref/code/if.png
deleted file mode 100644
index 177e61bd..00000000
--- a/tests/ref/code/if.png
+++ /dev/null
diff --git a/tests/ref/code/import.png b/tests/ref/code/import.png
deleted file mode 100644
index 00d3b2ee..00000000
--- a/tests/ref/code/import.png
+++ /dev/null
diff --git a/tests/ref/code/include.png b/tests/ref/code/include.png
deleted file mode 100644
index d3d66032..00000000
--- a/tests/ref/code/include.png
+++ /dev/null
diff --git a/tests/ref/code/let.png b/tests/ref/code/let.png
deleted file mode 100644
index 07afcb96..00000000
--- a/tests/ref/code/let.png
+++ /dev/null
diff --git a/tests/ref/code/ops.png b/tests/ref/code/ops.png
deleted file mode 100644
index abcab137..00000000
--- a/tests/ref/code/ops.png
+++ /dev/null
diff --git a/tests/ref/code/return.png b/tests/ref/code/return.png
deleted file mode 100644
index 50410887..00000000
--- a/tests/ref/code/return.png
+++ /dev/null
diff --git a/tests/ref/code/while.png b/tests/ref/code/while.png
deleted file mode 100644
index 026f9943..00000000
--- a/tests/ref/code/while.png
+++ /dev/null
diff --git a/tests/ref/coma.png b/tests/ref/coma.png
index 62edb5e0..8bfbc203 100644
--- a/tests/ref/coma.png
+++ b/tests/ref/coma.png
diff --git a/tests/ref/code/array.png b/tests/ref/compiler/array.png
index cbda8aee..cbda8aee 100644
--- a/tests/ref/code/array.png
+++ b/tests/ref/compiler/array.png
diff --git a/tests/ref/compiler/bench.png b/tests/ref/compiler/bench.png
new file mode 100644
index 00000000..cadc0914
--- /dev/null
+++ b/tests/ref/compiler/bench.png
diff --git a/tests/ref/compiler/block.png b/tests/ref/compiler/block.png
new file mode 100644
index 00000000..c5782da5
--- /dev/null
+++ b/tests/ref/compiler/block.png
diff --git a/tests/ref/code/break-continue.png b/tests/ref/compiler/break-continue.png
index 401b3940..401b3940 100644
--- a/tests/ref/code/break-continue.png
+++ b/tests/ref/compiler/break-continue.png
diff --git a/tests/ref/code/call.png b/tests/ref/compiler/call.png
index f0f2e852..f0f2e852 100644
--- a/tests/ref/code/call.png
+++ b/tests/ref/compiler/call.png
diff --git a/tests/ref/code/closure.png b/tests/ref/compiler/closure.png
index b4c83256..b4c83256 100644
--- a/tests/ref/code/closure.png
+++ b/tests/ref/compiler/closure.png
diff --git a/tests/ref/code/comment.png b/tests/ref/compiler/comment.png
index 5928dc87..5928dc87 100644
--- a/tests/ref/code/comment.png
+++ b/tests/ref/compiler/comment.png
diff --git a/tests/ref/style/construct.png b/tests/ref/compiler/construct.png
index 43cf5d79..43cf5d79 100644
--- a/tests/ref/style/construct.png
+++ b/tests/ref/compiler/construct.png
diff --git a/tests/ref/code/dict.png b/tests/ref/compiler/dict.png
index 04a5dd7d..04a5dd7d 100644
--- a/tests/ref/code/dict.png
+++ b/tests/ref/compiler/dict.png
diff --git a/tests/ref/code/for.png b/tests/ref/compiler/for.png
index 60c505ec..8c08ab04 100644
--- a/tests/ref/code/for.png
+++ b/tests/ref/compiler/for.png
diff --git a/tests/ref/compiler/if.png b/tests/ref/compiler/if.png
new file mode 100644
index 00000000..cca9a570
--- /dev/null
+++ b/tests/ref/compiler/if.png
diff --git a/tests/ref/compiler/import.png b/tests/ref/compiler/import.png
new file mode 100644
index 00000000..dddbe408
--- /dev/null
+++ b/tests/ref/compiler/import.png
diff --git a/tests/ref/compiler/include.png b/tests/ref/compiler/include.png
new file mode 100644
index 00000000..09ff7498
--- /dev/null
+++ b/tests/ref/compiler/include.png
diff --git a/tests/ref/style/label.png b/tests/ref/compiler/label.png
index ffad978c..ffad978c 100644
--- a/tests/ref/style/label.png
+++ b/tests/ref/compiler/label.png
diff --git a/tests/ref/compiler/let.png b/tests/ref/compiler/let.png
new file mode 100644
index 00000000..7a45eca1
--- /dev/null
+++ b/tests/ref/compiler/let.png
diff --git a/tests/ref/base/collection.png b/tests/ref/compiler/methods-collection.png
index e93e2beb..e93e2beb 100644
--- a/tests/ref/base/collection.png
+++ b/tests/ref/compiler/methods-collection.png
diff --git a/tests/ref/compiler/methods-color.png b/tests/ref/compiler/methods-color.png
new file mode 100644
index 00000000..9b65c16d
--- /dev/null
+++ b/tests/ref/compiler/methods-color.png
diff --git a/tests/ref/compiler/ops.png b/tests/ref/compiler/ops.png
new file mode 100644
index 00000000..ef6ffb4a
--- /dev/null
+++ b/tests/ref/compiler/ops.png
diff --git a/tests/ref/code/repr.png b/tests/ref/compiler/repr.png
index b81083f5..b81083f5 100644
--- a/tests/ref/code/repr.png
+++ b/tests/ref/compiler/repr.png
diff --git a/tests/ref/compiler/return.png b/tests/ref/compiler/return.png
new file mode 100644
index 00000000..6d558e62
--- /dev/null
+++ b/tests/ref/compiler/return.png
diff --git a/tests/ref/style/set.png b/tests/ref/compiler/set.png
index 94470239..94470239 100644
--- a/tests/ref/style/set.png
+++ b/tests/ref/compiler/set.png
diff --git a/tests/ref/text/shorthands.png b/tests/ref/compiler/shorthand.png
index ddb679f5..ddb679f5 100644
--- a/tests/ref/text/shorthands.png
+++ b/tests/ref/compiler/shorthand.png
diff --git a/tests/ref/style/show-bare.png b/tests/ref/compiler/show-bare.png
index ff746d26..ff746d26 100644
--- a/tests/ref/style/show-bare.png
+++ b/tests/ref/compiler/show-bare.png
diff --git a/tests/ref/style/show-node.png b/tests/ref/compiler/show-node.png
index 1ea33e4f..1ea33e4f 100644
--- a/tests/ref/style/show-node.png
+++ b/tests/ref/compiler/show-node.png
diff --git a/tests/ref/style/show-recursive.png b/tests/ref/compiler/show-recursive.png
index 4c47a7af..4c47a7af 100644
--- a/tests/ref/style/show-recursive.png
+++ b/tests/ref/compiler/show-recursive.png
diff --git a/tests/ref/style/show-selector.png b/tests/ref/compiler/show-selector.png
index 1cdcfa3f..1cdcfa3f 100644
--- a/tests/ref/style/show-selector.png
+++ b/tests/ref/compiler/show-selector.png
diff --git a/tests/ref/style/show-text.png b/tests/ref/compiler/show-text.png
index d0ed2f92..d0ed2f92 100644
--- a/tests/ref/style/show-text.png
+++ b/tests/ref/compiler/show-text.png
diff --git a/tests/ref/compiler/while.png b/tests/ref/compiler/while.png
new file mode 100644
index 00000000..236be426
--- /dev/null
+++ b/tests/ref/compiler/while.png
diff --git a/tests/ref/compute/create.png b/tests/ref/compute/create.png
new file mode 100644
index 00000000..600e6174
--- /dev/null
+++ b/tests/ref/compute/create.png
diff --git a/tests/ref/compute/data.png b/tests/ref/compute/data.png
new file mode 100644
index 00000000..678a1fd1
--- /dev/null
+++ b/tests/ref/compute/data.png
diff --git a/tests/ref/compute/utility.png b/tests/ref/compute/utility.png
new file mode 100644
index 00000000..035ce431
--- /dev/null
+++ b/tests/ref/compute/utility.png
diff --git a/tests/ref/empty.png b/tests/ref/empty.png
index 87c06b0a..db3a6695 100644
--- a/tests/ref/empty.png
+++ b/tests/ref/empty.png
diff --git a/tests/ref/graphics/hide.png b/tests/ref/graphics/hide.png
deleted file mode 100644
index 8a60cf90..00000000
--- a/tests/ref/graphics/hide.png
+++ /dev/null
diff --git a/tests/ref/graphics/shape-circle.png b/tests/ref/graphics/shape-circle.png
deleted file mode 100644
index 040c6f0b..00000000
--- a/tests/ref/graphics/shape-circle.png
+++ /dev/null
diff --git a/tests/ref/graphics/shape-ellipse.png b/tests/ref/graphics/shape-ellipse.png
deleted file mode 100644
index 296fc14e..00000000
--- a/tests/ref/graphics/shape-ellipse.png
+++ /dev/null
diff --git a/tests/ref/graphics/shape-fill-stroke.png b/tests/ref/graphics/shape-fill-stroke.png
deleted file mode 100644
index 91cddcc2..00000000
--- a/tests/ref/graphics/shape-fill-stroke.png
+++ /dev/null
diff --git a/tests/ref/graphics/shape-rect.png b/tests/ref/graphics/shape-rect.png
deleted file mode 100644
index e2ea0502..00000000
--- a/tests/ref/graphics/shape-rect.png
+++ /dev/null
diff --git a/tests/ref/graphics/shape-square.png b/tests/ref/graphics/shape-square.png
deleted file mode 100644
index 00a0c848..00000000
--- a/tests/ref/graphics/shape-square.png
+++ /dev/null
diff --git a/tests/ref/layout/columns.png b/tests/ref/layout/columns.png
index 6f210510..df7b7084 100644
--- a/tests/ref/layout/columns.png
+++ b/tests/ref/layout/columns.png
diff --git a/tests/ref/layout/container.png b/tests/ref/layout/container.png
index 87484c25..f82df108 100644
--- a/tests/ref/layout/container.png
+++ b/tests/ref/layout/container.png
diff --git a/tests/ref/layout/flow-orphan.png b/tests/ref/layout/flow-orphan.png
new file mode 100644
index 00000000..1e5fade4
--- /dev/null
+++ b/tests/ref/layout/flow-orphan.png
diff --git a/tests/ref/layout/grid-1.png b/tests/ref/layout/grid-1.png
index 2c57e28c..99a97bb7 100644
--- a/tests/ref/layout/grid-1.png
+++ b/tests/ref/layout/grid-1.png
diff --git a/tests/ref/layout/grid-2.png b/tests/ref/layout/grid-2.png
index 64986797..8bc22660 100644
--- a/tests/ref/layout/grid-2.png
+++ b/tests/ref/layout/grid-2.png
diff --git a/tests/ref/layout/grid-4.png b/tests/ref/layout/grid-4.png
index c78eb721..2bbc84cc 100644
--- a/tests/ref/layout/grid-4.png
+++ b/tests/ref/layout/grid-4.png
diff --git a/tests/ref/layout/grid-5.png b/tests/ref/layout/grid-5.png
index 8afe9446..532700b1 100644
--- a/tests/ref/layout/grid-5.png
+++ b/tests/ref/layout/grid-5.png
diff --git a/tests/ref/layout/hide.png b/tests/ref/layout/hide.png
new file mode 100644
index 00000000..6450d669
--- /dev/null
+++ b/tests/ref/layout/hide.png
diff --git a/tests/ref/layout/locate-break.png b/tests/ref/layout/locate-break.png
deleted file mode 100644
index 25abb4a0..00000000
--- a/tests/ref/layout/locate-break.png
+++ /dev/null
diff --git a/tests/ref/layout/locate-group.png b/tests/ref/layout/locate-group.png
deleted file mode 100644
index c9fe4065..00000000
--- a/tests/ref/layout/locate-group.png
+++ /dev/null
diff --git a/tests/ref/layout/locate.png b/tests/ref/layout/locate.png
deleted file mode 100644
index 015c5a6d..00000000
--- a/tests/ref/layout/locate.png
+++ /dev/null
diff --git a/tests/ref/layout/orphan-heading.png b/tests/ref/layout/orphan-heading.png
deleted file mode 100644
index aa5a7838..00000000
--- a/tests/ref/layout/orphan-heading.png
+++ /dev/null
diff --git a/tests/ref/layout/orphan-widow.png b/tests/ref/layout/orphan-widow.png
deleted file mode 100644
index 8fc523a6..00000000
--- a/tests/ref/layout/orphan-widow.png
+++ /dev/null
diff --git a/tests/ref/layout/page-margin.png b/tests/ref/layout/page-margin.png
index 211f881c..6952189b 100644
--- a/tests/ref/layout/page-margin.png
+++ b/tests/ref/layout/page-margin.png
diff --git a/tests/ref/layout/page-style.png b/tests/ref/layout/page-style.png
index 7132d20b..ac6b602c 100644
--- a/tests/ref/layout/page-style.png
+++ b/tests/ref/layout/page-style.png
diff --git a/tests/ref/layout/page.png b/tests/ref/layout/page.png
index 35716e4d..4168d201 100644
--- a/tests/ref/layout/page.png
+++ b/tests/ref/layout/page.png
diff --git a/tests/ref/text/bidi.png b/tests/ref/layout/par-bidi.png
index c9be82d4..c9be82d4 100644
--- a/tests/ref/text/bidi.png
+++ b/tests/ref/layout/par-bidi.png
diff --git a/tests/ref/layout/par-indent.png b/tests/ref/layout/par-indent.png
new file mode 100644
index 00000000..7a0bd4b6
--- /dev/null
+++ b/tests/ref/layout/par-indent.png
diff --git a/tests/ref/text/justify.png b/tests/ref/layout/par-justify.png
index e8b50723..e8b50723 100644
--- a/tests/ref/text/justify.png
+++ b/tests/ref/layout/par-justify.png
diff --git a/tests/ref/layout/par-knuth.png b/tests/ref/layout/par-knuth.png
new file mode 100644
index 00000000..fca0892e
--- /dev/null
+++ b/tests/ref/layout/par-knuth.png
diff --git a/tests/ref/layout/par-simple.png b/tests/ref/layout/par-simple.png
new file mode 100644
index 00000000..92f98b36
--- /dev/null
+++ b/tests/ref/layout/par-simple.png
diff --git a/tests/ref/text/par.png b/tests/ref/layout/par.png
index 199c8919..199c8919 100644
--- a/tests/ref/text/par.png
+++ b/tests/ref/layout/par.png
diff --git a/tests/ref/layout/repeat.png b/tests/ref/layout/repeat.png
new file mode 100644
index 00000000..fcd52987
--- /dev/null
+++ b/tests/ref/layout/repeat.png
diff --git a/tests/ref/layout/stack-2.png b/tests/ref/layout/stack-2.png
index 52b75bbd..af58d9c4 100644
--- a/tests/ref/layout/stack-2.png
+++ b/tests/ref/layout/stack-2.png
diff --git a/tests/ref/graphics/transform.png b/tests/ref/layout/transform.png
index cb4b0af2..cb4b0af2 100644
--- a/tests/ref/graphics/transform.png
+++ b/tests/ref/layout/transform.png
diff --git a/tests/ref/layout/math.png b/tests/ref/math/simple.png
index 902354df..902354df 100644
--- a/tests/ref/layout/math.png
+++ b/tests/ref/math/simple.png
diff --git a/tests/ref/meta/document.png b/tests/ref/meta/document.png
new file mode 100644
index 00000000..bc0a95bf
--- /dev/null
+++ b/tests/ref/meta/document.png
diff --git a/tests/ref/meta/link.png b/tests/ref/meta/link.png
new file mode 100644
index 00000000..604e09d0
--- /dev/null
+++ b/tests/ref/meta/link.png
diff --git a/tests/ref/structure/desc.png b/tests/ref/structure/desc.png
deleted file mode 100644
index e8b1d151..00000000
--- a/tests/ref/structure/desc.png
+++ /dev/null
diff --git a/tests/ref/structure/enum.png b/tests/ref/structure/enum.png
deleted file mode 100644
index 39227b5b..00000000
--- a/tests/ref/structure/enum.png
+++ /dev/null
diff --git a/tests/ref/style/closure.png b/tests/ref/style/closure.png
deleted file mode 100644
index 77d88d0c..00000000
--- a/tests/ref/style/closure.png
+++ /dev/null
diff --git a/tests/ref/text/baseline.png b/tests/ref/text/baseline.png
index 37bb1949..f011c8c4 100644
--- a/tests/ref/text/baseline.png
+++ b/tests/ref/text/baseline.png
diff --git a/tests/ref/text/chinese.png b/tests/ref/text/chinese.png
index aa8801c0..89ee357b 100644
--- a/tests/ref/text/chinese.png
+++ b/tests/ref/text/chinese.png
diff --git a/tests/ref/text/emph-strong.png b/tests/ref/text/emph-strong.png
deleted file mode 100644
index cce98812..00000000
--- a/tests/ref/text/emph-strong.png
+++ /dev/null
diff --git a/tests/ref/text/emphasis.png b/tests/ref/text/emphasis.png
new file mode 100644
index 00000000..c004421d
--- /dev/null
+++ b/tests/ref/text/emphasis.png
diff --git a/tests/ref/text/features.png b/tests/ref/text/features.png
index 36609d89..1c3b030c 100644
--- a/tests/ref/text/features.png
+++ b/tests/ref/text/features.png
diff --git a/tests/ref/text/hyphenate.png b/tests/ref/text/hyphenate.png
index 47a8ffa5..e304cb8c 100644
--- a/tests/ref/text/hyphenate.png
+++ b/tests/ref/text/hyphenate.png
diff --git a/tests/ref/text/indent.png b/tests/ref/text/indent.png
deleted file mode 100644
index 9cf2ace5..00000000
--- a/tests/ref/text/indent.png
+++ /dev/null
diff --git a/tests/ref/text/knuth.png b/tests/ref/text/knuth.png
deleted file mode 100644
index 8595fe29..00000000
--- a/tests/ref/text/knuth.png
+++ /dev/null
diff --git a/tests/ref/text/link.png b/tests/ref/text/link.png
deleted file mode 100644
index 9d5cb054..00000000
--- a/tests/ref/text/link.png
+++ /dev/null
diff --git a/tests/ref/text/microtype.png b/tests/ref/text/microtype.png
index 7edc61cc..e0d149e6 100644
--- a/tests/ref/text/microtype.png
+++ b/tests/ref/text/microtype.png
diff --git a/tests/ref/text/plain.png b/tests/ref/text/plain.png
deleted file mode 100644
index bfdf47a2..00000000
--- a/tests/ref/text/plain.png
+++ /dev/null
diff --git a/tests/ref/text/quotes.png b/tests/ref/text/quotes.png
index 058055ae..1054daca 100644
--- a/tests/ref/text/quotes.png
+++ b/tests/ref/text/quotes.png
diff --git a/tests/ref/text/code.png b/tests/ref/text/raw-highlight.png
index e0387870..e0387870 100644
--- a/tests/ref/text/code.png
+++ b/tests/ref/text/raw-highlight.png
diff --git a/tests/ref/text/raw.png b/tests/ref/text/raw.png
index 3a7691fd..f7912051 100644
--- a/tests/ref/text/raw.png
+++ b/tests/ref/text/raw.png
diff --git a/tests/ref/text/repeat.png b/tests/ref/text/repeat.png
deleted file mode 100644
index d7786bef..00000000
--- a/tests/ref/text/repeat.png
+++ /dev/null
diff --git a/tests/ref/text/shifts.png b/tests/ref/text/shift.png
index 7e8d99a9..7e8d99a9 100644
--- a/tests/ref/text/shifts.png
+++ b/tests/ref/text/shift.png
diff --git a/tests/ref/text/space.png b/tests/ref/text/space.png
new file mode 100644
index 00000000..09efda70
--- /dev/null
+++ b/tests/ref/text/space.png
diff --git a/tests/ref/text/tracking-spacing.png b/tests/ref/text/tracking-spacing.png
index 69fc1eef..2ce0d549 100644
--- a/tests/ref/text/tracking-spacing.png
+++ b/tests/ref/text/tracking-spacing.png
diff --git a/tests/ref/text/whitespace.png b/tests/ref/text/whitespace.png
deleted file mode 100644
index 9a1ed3cd..00000000
--- a/tests/ref/text/whitespace.png
+++ /dev/null
diff --git a/tests/ref/graphics/image.png b/tests/ref/visualize/image.png
index a89f1963..a89f1963 100644
--- a/tests/ref/graphics/image.png
+++ b/tests/ref/visualize/image.png
diff --git a/tests/ref/graphics/line.png b/tests/ref/visualize/line.png
index 4a73ccd7..4a73ccd7 100644
--- a/tests/ref/graphics/line.png
+++ b/tests/ref/visualize/line.png
diff --git a/tests/ref/graphics/shape-aspect.png b/tests/ref/visualize/shape-aspect.png
index a8e458fb..a8e458fb 100644
--- a/tests/ref/graphics/shape-aspect.png
+++ b/tests/ref/visualize/shape-aspect.png
diff --git a/tests/ref/visualize/shape-circle.png b/tests/ref/visualize/shape-circle.png
new file mode 100644
index 00000000..6cbbc0e3
--- /dev/null
+++ b/tests/ref/visualize/shape-circle.png
diff --git a/tests/ref/visualize/shape-ellipse.png b/tests/ref/visualize/shape-ellipse.png
new file mode 100644
index 00000000..50467dce
--- /dev/null
+++ b/tests/ref/visualize/shape-ellipse.png
diff --git a/tests/ref/visualize/shape-fill-stroke.png b/tests/ref/visualize/shape-fill-stroke.png
new file mode 100644
index 00000000..b8c78a55
--- /dev/null
+++ b/tests/ref/visualize/shape-fill-stroke.png
diff --git a/tests/ref/visualize/shape-rect.png b/tests/ref/visualize/shape-rect.png
new file mode 100644
index 00000000..b3311ba5
--- /dev/null
+++ b/tests/ref/visualize/shape-rect.png
diff --git a/tests/ref/visualize/shape-square.png b/tests/ref/visualize/shape-square.png
new file mode 100644
index 00000000..1f5303b9
--- /dev/null
+++ b/tests/ref/visualize/shape-square.png
diff --git a/tests/src/benches.rs b/tests/src/benches.rs
index 1ae012eb..4cd7d9c3 100644
--- a/tests/src/benches.rs
+++ b/tests/src/benches.rs
@@ -10,7 +10,7 @@ use typst::util::Buffer;
 use typst::World;
 use unscanny::Scanner;
 
-const TEXT: &str = include_str!("../typ/benches/bench.typ");
+const TEXT: &str = include_str!("../typ/compiler/bench.typ");
 const FONT: &[u8] = include_bytes!("../fonts/IBMPlexSans-Regular.ttf");
 
 main!(
@@ -111,7 +111,7 @@ impl BenchWorld {
         let book = FontBook::from_fonts([&font]);
 
         Self {
-            library: Prehashed::new(typst_library::new()),
+            library: Prehashed::new(typst_library::build()),
             book: Prehashed::new(book),
             font,
             source: Source::detached(TEXT),
diff --git a/tests/src/tests.rs b/tests/src/tests.rs
index 215d7fe7..e7c630f6 100644
--- a/tests/src/tests.rs
+++ b/tests/src/tests.rs
@@ -145,7 +145,7 @@ impl Args {
 }
 
 fn library() -> Library {
-    let mut lib = typst_library::new();
+    let mut lib = typst_library::build();
 
     // Set page width to 120pt with 10pt margins, so that the inner page is
     // exactly 100pt wide. Page height is unbounded and font size is 10pt so
diff --git a/tests/typ/base/assert.typ b/tests/typ/base/assert.typ
deleted file mode 100644
index b0c8aafd..00000000
--- a/tests/typ/base/assert.typ
+++ /dev/null
@@ -1,23 +0,0 @@
-// Test the `assert` function.
-// Ref: false
-
----
-#assert(1 + 1 == 2)
-#assert(range(2, 5) == (2, 3, 4))
-#assert(not false)
-
----
-// Test failing assertions.
-// Error: 9-15 assertion failed
-#assert(1 == 2)
-
----
-// Test failing assertions.
-// Error: 9-15 expected boolean, found string
-#assert("true")
-
----
-// Test the `type` function.
-#test(type(1), "integer")
-#test(type(ltr), "direction")
-#test(type(10 / 3), "float")
diff --git a/tests/typ/base/numbering.typ b/tests/typ/base/numbering.typ
deleted file mode 100644
index 200850bc..00000000
--- a/tests/typ/base/numbering.typ
+++ /dev/null
@@ -1,13 +0,0 @@
-// Test integrated numbering patterns.
-
----
-#for i in range(9) {
-  numbering(i, "* and ")
-  numbering(i, "I")
-  [ for #i]
-  parbreak()
-}
-
----
-// Error: 12-14 must be at least zero
-#numbering(-1, "1")
diff --git a/tests/typ/base/type.typ b/tests/typ/base/type.typ
deleted file mode 100644
index 37cf8623..00000000
--- a/tests/typ/base/type.typ
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test the `type` function.
-// Ref: false
-
----
-#test(type(1), "integer")
-#test(type(ltr), "direction")
-#test(type(10 / 3), "float")
diff --git a/tests/typ/structure/desc.typ b/tests/typ/basics/desc.typ
index 1bc92625..1bc92625 100644
--- a/tests/typ/structure/desc.typ
+++ b/tests/typ/basics/desc.typ
diff --git a/tests/typ/structure/enum.typ b/tests/typ/basics/enum.typ
index d4c30385..d4c30385 100644
--- a/tests/typ/structure/enum.typ
+++ b/tests/typ/basics/enum.typ
diff --git a/tests/typ/structure/heading.typ b/tests/typ/basics/heading.typ
index 9fd4e648..9fd4e648 100644
--- a/tests/typ/structure/heading.typ
+++ b/tests/typ/basics/heading.typ
diff --git a/tests/typ/structure/attach.typ b/tests/typ/basics/list-attach.typ
index 9d043eb0..9d043eb0 100644
--- a/tests/typ/structure/attach.typ
+++ b/tests/typ/basics/list-attach.typ
diff --git a/tests/typ/structure/list.typ b/tests/typ/basics/list.typ
index 9ed5993a..9ed5993a 100644
--- a/tests/typ/structure/list.typ
+++ b/tests/typ/basics/list.typ
diff --git a/tests/typ/structure/table.typ b/tests/typ/basics/table.typ
index 527141c5..527141c5 100644
--- a/tests/typ/structure/table.typ
+++ b/tests/typ/basics/table.typ
diff --git a/tests/typ/code/array.typ b/tests/typ/compiler/array.typ
index cb8433cb..cb8433cb 100644
--- a/tests/typ/code/array.typ
+++ b/tests/typ/compiler/array.typ
diff --git a/tests/typ/benches/bench.typ b/tests/typ/compiler/bench.typ
index 6aff1ac2..6aff1ac2 100644
--- a/tests/typ/benches/bench.typ
+++ b/tests/typ/compiler/bench.typ
diff --git a/tests/typ/code/block.typ b/tests/typ/compiler/block.typ
index d82d497f..45f63f8e 100644
--- a/tests/typ/code/block.typ
+++ b/tests/typ/compiler/block.typ
@@ -79,7 +79,7 @@
 ---
 // Double block creates a scope.
 {{
-  import b from "target.typ"
+  import b from "module.typ"
   test(b, 1)
 }}
 
diff --git a/tests/typ/code/break-continue.typ b/tests/typ/compiler/break-continue.typ
index fb3222fa..fb3222fa 100644
--- a/tests/typ/code/break-continue.typ
+++ b/tests/typ/compiler/break-continue.typ
diff --git a/tests/typ/code/call.typ b/tests/typ/compiler/call.typ
index dc582c9c..dc582c9c 100644
--- a/tests/typ/code/call.typ
+++ b/tests/typ/compiler/call.typ
diff --git a/tests/typ/code/closure.typ b/tests/typ/compiler/closure.typ
index e9389e13..2c6c1ea0 100644
--- a/tests/typ/code/closure.typ
+++ b/tests/typ/compiler/closure.typ
@@ -60,7 +60,7 @@
 ---
 // Import bindings.
 {
-  let b = "target.typ"
+  let b = "module.typ"
   let f() = {
     import b from b
     b
diff --git a/tests/typ/code/comment.typ b/tests/typ/compiler/comment.typ
index 4a4dc7ab..4a4dc7ab 100644
--- a/tests/typ/code/comment.typ
+++ b/tests/typ/compiler/comment.typ
diff --git a/tests/typ/style/construct.typ b/tests/typ/compiler/construct.typ
index f535184c..f535184c 100644
--- a/tests/typ/style/construct.typ
+++ b/tests/typ/compiler/construct.typ
diff --git a/tests/typ/code/dict.typ b/tests/typ/compiler/dict.typ
index d791f77b..d791f77b 100644
--- a/tests/typ/code/dict.typ
+++ b/tests/typ/compiler/dict.typ
diff --git a/tests/typ/code/field.typ b/tests/typ/compiler/field.typ
index abea87fb..abea87fb 100644
--- a/tests/typ/code/field.typ
+++ b/tests/typ/compiler/field.typ
diff --git a/tests/typ/code/for.typ b/tests/typ/compiler/for.typ
index 822f7423..822f7423 100644
--- a/tests/typ/code/for.typ
+++ b/tests/typ/compiler/for.typ
diff --git a/tests/typ/code/if.typ b/tests/typ/compiler/if.typ
index 0d87c689..0d87c689 100644
--- a/tests/typ/code/if.typ
+++ b/tests/typ/compiler/if.typ
diff --git a/tests/typ/code/import.typ b/tests/typ/compiler/import.typ
index 5291af39..0620403d 100644
--- a/tests/typ/code/import.typ
+++ b/tests/typ/compiler/import.typ
@@ -4,45 +4,45 @@
 // Test importing semantics.
 
 // A named import.
-#import item from "target.typ"
+#import item from "module.typ"
 #test(item(1, 2), 3)
 
 // Test that this will be overwritten.
 #let value = [foo]
 
 // Import multiple things.
-#import fn, value from "target.typ"
+#import fn, value from "module.typ"
 #fn[Like and Subscribe!]
 #value
 
 // Code mode
 {
-  import b from "target.typ"
+  import b from "module.typ"
   test(b, 1)
 }
 
 // A wildcard import.
-#import * from "target.typ"
+#import * from "module.typ"
 
 // It exists now!
 #d
 
 // Who needs whitespace anyways?
-#import*from"target.typ"
+#import*from"module.typ"
 
 // Should output `bye`.
 // Stop at semicolon.
-#import a, c from "target.typ";bye
+#import a, c from "module.typ";bye
 
 // Allow the trailing comma.
-#import a, c, from "target.typ"
+#import a, c, from "module.typ"
 
 ---
 // Error: 19-21 failed to load file (is a directory)
 #import name from ""
 
 ---
-// Error: 16-27 file not found (searched at typ/code/lib/0.2.1)
+// Error: 16-27 file not found (searched at typ/compiler/lib/0.2.1)
 #import * from "lib/0.2.1"
 
 ---
@@ -53,7 +53,7 @@
 ---
 // Unresolved import.
 // Error: 9-21 unresolved import
-#import non_existing from "target.typ"
+#import non_existing from "module.typ"
 
 ---
 // Cyclic import of this very file.
@@ -62,7 +62,7 @@
 
 ---
 // Cyclic import in other file.
-#import * from "./importable/cycle1.typ"
+#import * from "./modules/cycle1.typ"
 
 This is never reached.
 
@@ -80,36 +80,36 @@ This is never reached.
 #import afrom, "b", c
 
 // Error: 9 expected import items
-#import from "target.typ"
+#import from "module.typ"
 
 // Error: 9-10 expected expression, found assignment operator
 // Error: 10 expected import items
-#import = from "target.typ"
+#import = from "module.typ"
 
 // Error: 15 expected expression
 #import * from
 
 // An additional trailing comma.
 // Error: 17-18 expected expression, found comma
-#import a, b, c,, from "target.typ"
+#import a, b, c,, from "module.typ"
 
 // Error: 1-6 unexpected keyword `from`
-#from "target.typ"
+#from "module.typ"
 
 // Error: 2:2 expected semicolon or line break
-#import * from "target.typ
+#import * from "module.typ
 "target
 
 // Error: 28 expected semicolon or line break
-#import * from "target.typ" § 0.2.1
+#import * from "module.typ" § 0.2.1
 
 // A star in the list.
 // Error: 12-13 expected expression, found star
-#import a, *, b from "target.typ"
+#import a, *, b from "module.typ"
 
 // An item after a star.
 // Error: 10 expected keyword `from`
-#import *, a from "target.typ"
+#import *, a from "module.typ"
 
 ---
 // Error: 9-13 expected identifier, found named pair
diff --git a/tests/typ/code/include.typ b/tests/typ/compiler/include.typ
index e862adac..289fea21 100644
--- a/tests/typ/code/include.typ
+++ b/tests/typ/compiler/include.typ
@@ -6,22 +6,22 @@
 = Document
 
 // Include a file
-#include "/typ/code/importable/chap1.typ"
+#include "/typ/compiler/modules/chap1.typ"
 
 // Expression as a file name.
-#let chap2 = include "import" + "able/chap" + "2.typ"
+#let chap2 = include "modu" + "les/chap" + "2.typ"
 
 -- _Intermission_ --
 #chap2
 
 ---
 {
-  // Error: 19-41 file not found (searched at typ/code/importable/chap3.typ)
-  let x = include "importable/chap3.typ"
+  // Error: 19-38 file not found (searched at typ/compiler/modules/chap3.typ)
+  let x = include "modules/chap3.typ"
 }
 
 ---
-#include "importable/chap1.typ"
+#include "modules/chap1.typ"
 
 // The variables of the file should not appear in this scope.
 // Error: 1-6 unknown variable
diff --git a/tests/typ/style/label.typ b/tests/typ/compiler/label.typ
index 795c0435..795c0435 100644
--- a/tests/typ/style/label.typ
+++ b/tests/typ/compiler/label.typ
diff --git a/tests/typ/code/let.typ b/tests/typ/compiler/let.typ
index c3be64a5..c3be64a5 100644
--- a/tests/typ/code/let.typ
+++ b/tests/typ/compiler/let.typ
diff --git a/tests/typ/base/collection.typ b/tests/typ/compiler/methods-collection.typ
index 46ff97ab..fcebf640 100644
--- a/tests/typ/base/collection.typ
+++ b/tests/typ/compiler/methods-collection.typ
@@ -1,4 +1,4 @@
-// Test collection functions.
+// Test the collection methods.
 // Ref: false
 
 ---
diff --git a/tests/typ/compiler/methods-color.typ b/tests/typ/compiler/methods-color.typ
new file mode 100644
index 00000000..1188030a
--- /dev/null
+++ b/tests/typ/compiler/methods-color.typ
@@ -0,0 +1,22 @@
+// Test color modification methods.
+
+---
+// Test gray color modification.
+#test(luma(20%).lighten(50%), luma(60%))
+#test(luma(80%).darken(20%), luma(63.9%))
+#test(luma(80%).negate(), luma(20%))
+
+---
+// Test CMYK color conversion.
+// Ref: true
+#let c = cmyk(50%, 64%, 16%, 17%)
+#rect(width: 1cm, fill: cmyk(69%, 11%, 69%, 41%))
+#rect(width: 1cm, fill: c)
+#rect(width: 1cm, fill: c.negate())
+
+#for x in range(0, 11) {
+  square(width: 9pt, fill: c.lighten(x * 10%))
+}
+#for x in range(0, 11) {
+  square(width: 9pt, fill: c.darken(x * 10%))
+}
diff --git a/tests/typ/base/string.typ b/tests/typ/compiler/methods-str.typ
index e724f563..aead4aa4 100644
--- a/tests/typ/base/string.typ
+++ b/tests/typ/compiler/methods-str.typ
@@ -1,19 +1,7 @@
-// Test string related methods.
+// Test the string methods.
 // Ref: false
 
 ---
-// Test conversion to string.
-#test(str(123), "123")
-#test(str(50.14), "50.14")
-#test(str(10 / 3).len() > 10, true)
-#test(repr(ltr), "ltr")
-#test(repr((1, 2, false, )), "(1, 2, false)")
-
----
-// Error: 6-8 cannot convert content to string
-#str([])
-
----
 // Test the `slice` method.
 #test("abc".slice(1, 2), "b")
 #test("abc🏡def".slice(2, 7), "c🏡")
@@ -127,14 +115,3 @@
 #test("abc".split("b"), ("a", "c"))
 #test("a123c".split(regex("\d")), ("a", "", "", "c"))
 #test("a123c".split(regex("\d+")), ("a", "c"))
-
----
-// Test the `upper` and `lower` functions.
-#let memes = "ArE mEmEs gReAt?";
-#test(lower(memes), "are memes great?")
-#test(upper(memes), "ARE MEMES GREAT?")
-#test(upper("Ελλάδα"), "ΕΛΛΆΔΑ")
-
----
-// Error: 8-9 expected string or content, found integer
-#upper(1)
diff --git a/tests/typ/code/methods.typ b/tests/typ/compiler/methods.typ
index f5db8ca0..07f6e410 100644
--- a/tests/typ/code/methods.typ
+++ b/tests/typ/compiler/methods.typ
@@ -43,8 +43,4 @@
 
 ---
 // Error: 3-6 cannot mutate a constant
-{ box = 1 }
-
----
-// Error: 3-6 cannot mutate a constant
 { box.push(1) }
diff --git a/tests/typ/code/target.typ b/tests/typ/compiler/module.typ
index b0a3fbf3..b0a3fbf3 100644
--- a/tests/typ/code/target.typ
+++ b/tests/typ/compiler/module.typ
diff --git a/tests/typ/code/importable/chap1.typ b/tests/typ/compiler/modules/chap1.typ
index 06a4c1a1..06a4c1a1 100644
--- a/tests/typ/code/importable/chap1.typ
+++ b/tests/typ/compiler/modules/chap1.typ
diff --git a/tests/typ/code/importable/chap2.typ b/tests/typ/compiler/modules/chap2.typ
index d4aedc60..d4aedc60 100644
--- a/tests/typ/code/importable/chap2.typ
+++ b/tests/typ/compiler/modules/chap2.typ
diff --git a/tests/typ/code/importable/cycle1.typ b/tests/typ/compiler/modules/cycle1.typ
index a9c00f5e..a9c00f5e 100644
--- a/tests/typ/code/importable/cycle1.typ
+++ b/tests/typ/compiler/modules/cycle1.typ
diff --git a/tests/typ/code/importable/cycle2.typ b/tests/typ/compiler/modules/cycle2.typ
index 204da519..204da519 100644
--- a/tests/typ/code/importable/cycle2.typ
+++ b/tests/typ/compiler/modules/cycle2.typ
diff --git a/tests/typ/code/ops-assoc.typ b/tests/typ/compiler/ops-assoc.typ
index ec128c61..ec128c61 100644
--- a/tests/typ/code/ops-assoc.typ
+++ b/tests/typ/compiler/ops-assoc.typ
diff --git a/tests/typ/code/ops-invalid.typ b/tests/typ/compiler/ops-invalid.typ
index 3e9e5478..3e9e5478 100644
--- a/tests/typ/code/ops-invalid.typ
+++ b/tests/typ/compiler/ops-invalid.typ
diff --git a/tests/typ/code/ops-prec.typ b/tests/typ/compiler/ops-prec.typ
index 23afcc5f..23afcc5f 100644
--- a/tests/typ/code/ops-prec.typ
+++ b/tests/typ/compiler/ops-prec.typ
diff --git a/tests/typ/code/ops.typ b/tests/typ/compiler/ops.typ
index c382f34d..a38a527c 100644
--- a/tests/typ/code/ops.typ
+++ b/tests/typ/compiler/ops.typ
@@ -189,6 +189,10 @@
 { x += "thing" } #test(x, "something")
 
 ---
+// Error: 3-6 cannot mutate a constant
+{ box = 1 }
+
+---
 // Test `in` operator.
 #test("hi" in "worship", true)
 #test("hi" in ("we", "hi", "bye"), true)
diff --git a/tests/typ/code/repr.typ b/tests/typ/compiler/repr.typ
index bdea9c82..bdea9c82 100644
--- a/tests/typ/code/repr.typ
+++ b/tests/typ/compiler/repr.typ
diff --git a/tests/typ/code/return.typ b/tests/typ/compiler/return.typ
index 0eea394e..0eea394e 100644
--- a/tests/typ/code/return.typ
+++ b/tests/typ/compiler/return.typ
diff --git a/tests/typ/style/set.typ b/tests/typ/compiler/set.typ
index fc5053b1..fc5053b1 100644
--- a/tests/typ/style/set.typ
+++ b/tests/typ/compiler/set.typ
diff --git a/tests/typ/text/shorthands.typ b/tests/typ/compiler/shorthand.typ
index 5c94dab0..5c94dab0 100644
--- a/tests/typ/text/shorthands.typ
+++ b/tests/typ/compiler/shorthand.typ
diff --git a/tests/typ/style/show-bare.typ b/tests/typ/compiler/show-bare.typ
index 8b8d0852..8b8d0852 100644
--- a/tests/typ/style/show-bare.typ
+++ b/tests/typ/compiler/show-bare.typ
diff --git a/tests/typ/style/show-node.typ b/tests/typ/compiler/show-node.typ
index 98f36f13..98f36f13 100644
--- a/tests/typ/style/show-node.typ
+++ b/tests/typ/compiler/show-node.typ
diff --git a/tests/typ/style/show-recursive.typ b/tests/typ/compiler/show-recursive.typ
index 91a295f2..91a295f2 100644
--- a/tests/typ/style/show-recursive.typ
+++ b/tests/typ/compiler/show-recursive.typ
diff --git a/tests/typ/style/show-selector.typ b/tests/typ/compiler/show-selector.typ
index 0e9823a5..0e9823a5 100644
--- a/tests/typ/style/show-selector.typ
+++ b/tests/typ/compiler/show-selector.typ
diff --git a/tests/typ/style/show-text.typ b/tests/typ/compiler/show-text.typ
index 124d2ed2..124d2ed2 100644
--- a/tests/typ/style/show-text.typ
+++ b/tests/typ/compiler/show-text.typ
diff --git a/tests/typ/code/spread.typ b/tests/typ/compiler/spread.typ
index ff661ead..ff661ead 100644
--- a/tests/typ/code/spread.typ
+++ b/tests/typ/compiler/spread.typ
diff --git a/tests/typ/code/while.typ b/tests/typ/compiler/while.typ
index 5dc5ae41..5dc5ae41 100644
--- a/tests/typ/code/while.typ
+++ b/tests/typ/compiler/while.typ
diff --git a/tests/typ/base/calc.typ b/tests/typ/compute/calc.typ
index 4ccefa22..4ccefa22 100644
--- a/tests/typ/base/calc.typ
+++ b/tests/typ/compute/calc.typ
diff --git a/tests/typ/base/color.typ b/tests/typ/compute/create.typ
index aecd86b8..462f06e9 100644
--- a/tests/typ/base/color.typ
+++ b/tests/typ/compute/create.typ
@@ -1,4 +1,4 @@
-// Test color creation functions and modification methods.
+// Test creation and conversion functions.
 // Ref: false
 
 ---
@@ -21,27 +21,6 @@
 #rect(fill: luma(80%))
 
 ---
-// Test gray color modification.
-#test(luma(20%).lighten(50%), luma(60%))
-#test(luma(80%).darken(20%), luma(63.9%))
-#test(luma(80%).negate(), luma(20%))
-
----
-// Test CMYK color conversion.
-// Ref: true
-#let c = cmyk(50%, 64%, 16%, 17%)
-#rect(width: 1cm, fill: cmyk(69%, 11%, 69%, 41%))
-#rect(width: 1cm, fill: c)
-#rect(width: 1cm, fill: c.negate())
-
-#for x in range(0, 11) {
-    square(width: 9pt, fill: c.lighten(x * 10%))
-}
-#for x in range(0, 11) {
-    square(width: 9pt, fill: c.darken(x * 10%))
-}
-
----
 // Error for values that are out of range.
 // Error: 11-14 must be between 0 and 255
 #test(rgb(-30, 15, 50))
@@ -61,3 +40,16 @@
 ---
 // Error: 21-26 expected integer or ratio, found boolean
 #rgb(10%, 20%, 30%, false)
+
+---
+// Test conversion to string.
+#test(str(123), "123")
+#test(str(50.14), "50.14")
+#test(str(10 / 3).len() > 10, true)
+
+---
+// Error: 6-8 cannot convert content to string
+#str([])
+
+---
+#assert(range(2, 5) == (2, 3, 4))
diff --git a/tests/typ/base/data.typ b/tests/typ/compute/data.typ
index 96b12ff5..c1def7d5 100644
--- a/tests/typ/base/data.typ
+++ b/tests/typ/compute/data.typ
@@ -10,7 +10,7 @@
 #table(columns: data(0).len(), ..cells)
 
 ---
-// Error: 6-16 file not found (searched at typ/base/nope.csv)
+// Error: 6-16 file not found (searched at typ/compute/nope.csv)
 #csv("nope.csv")
 
 ---
diff --git a/tests/typ/base/eval.typ b/tests/typ/compute/foundations.typ
index 80235c0c..6fc93a75 100644
--- a/tests/typ/base/eval.typ
+++ b/tests/typ/compute/foundations.typ
@@ -1,4 +1,30 @@
-// Test the `eval` function.
+// Test foundational functions.
+// Ref: false
+
+---
+#test(type(1), "integer")
+#test(type(ltr), "direction")
+#test(type(10 / 3), "float")
+
+---
+#test(repr(ltr), "ltr")
+#test(repr((1, 2, false, )), "(1, 2, false)")
+
+---
+// Test failing assertions.
+// Error: 9-15 assertion failed
+#assert(1 == 2)
+
+---
+// Test failing assertions.
+// Error: 9-15 expected boolean, found string
+#assert("true")
+
+---
+// Test the `type` function.
+#test(type(1), "integer")
+#test(type(ltr), "direction")
+#test(type(10 / 3), "float")
 
 ---
 #eval("_Hello" + " World!_")
diff --git a/tests/typ/base/blind.typ b/tests/typ/compute/utility.typ
index 17452dec..f042c769 100644
--- a/tests/typ/base/blind.typ
+++ b/tests/typ/compute/utility.typ
@@ -1,4 +1,4 @@
-// Test blind text.
+// Test integrated numbering patterns.
 
 ---
 // Test basic call.
@@ -30,3 +30,15 @@
 ---
 // Error: 7-9 missing argument: number of words
 #lorem()
+
+---
+#for i in range(9) {
+  numbering(i, "* and ")
+  numbering(i, "I")
+  [ for #i]
+  parbreak()
+}
+
+---
+// Error: 12-14 must be at least zero
+#numbering(-1, "1")
diff --git a/tests/typ/layout/orphan-widow.typ b/tests/typ/layout/flow-orphan.typ
index 445b44e3..a51da2b2 100644
--- a/tests/typ/layout/orphan-widow.typ
+++ b/tests/typ/layout/flow-orphan.typ
@@ -1,4 +1,11 @@
-// Test widow and orphan prevention.
+// Test that a heading doesn't become an orphan.
+
+---
+#set page(height: 100pt)
+#lorem(12)
+
+= Introduction
+This is the start and it goes on.
 
 ---
 #set page("a8", height: 150pt)
diff --git a/tests/typ/graphics/hide.typ b/tests/typ/layout/hide.typ
index a979b24f..a979b24f 100644
--- a/tests/typ/graphics/hide.typ
+++ b/tests/typ/layout/hide.typ
diff --git a/tests/typ/layout/orphan-heading.typ b/tests/typ/layout/orphan-heading.typ
deleted file mode 100644
index ef3de885..00000000
--- a/tests/typ/layout/orphan-heading.typ
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test that a heading doesn't become an orphan.
-
----
-#set page(height: 100pt)
-#lorem(12)
-
-= Introduction
-This is the start and it goes on.
diff --git a/tests/typ/text/bidi.typ b/tests/typ/layout/par-bidi.typ
index 11c0cafa..11c0cafa 100644
--- a/tests/typ/text/bidi.typ
+++ b/tests/typ/layout/par-bidi.typ
diff --git a/tests/typ/text/indent.typ b/tests/typ/layout/par-indent.typ
index 8454dda5..8454dda5 100644
--- a/tests/typ/text/indent.typ
+++ b/tests/typ/layout/par-indent.typ
diff --git a/tests/typ/text/justify.typ b/tests/typ/layout/par-justify.typ
index e3d61322..e3d61322 100644
--- a/tests/typ/text/justify.typ
+++ b/tests/typ/layout/par-justify.typ
diff --git a/tests/typ/text/knuth.typ b/tests/typ/layout/par-knuth.typ
index 59349738..59349738 100644
--- a/tests/typ/text/knuth.typ
+++ b/tests/typ/layout/par-knuth.typ
diff --git a/tests/typ/text/plain.typ b/tests/typ/layout/par-simple.typ
index 34a2d626..34a2d626 100644
--- a/tests/typ/text/plain.typ
+++ b/tests/typ/layout/par-simple.typ
diff --git a/tests/typ/text/par.typ b/tests/typ/layout/par.typ
index 558059e9..558059e9 100644
--- a/tests/typ/text/par.typ
+++ b/tests/typ/layout/par.typ
diff --git a/tests/typ/text/repeat.typ b/tests/typ/layout/repeat.typ
index 13e99b51..13e99b51 100644
--- a/tests/typ/text/repeat.typ
+++ b/tests/typ/layout/repeat.typ
diff --git a/tests/typ/graphics/transform.typ b/tests/typ/layout/transform.typ
index 2dde626b..2dde626b 100644
--- a/tests/typ/graphics/transform.typ
+++ b/tests/typ/layout/transform.typ
diff --git a/tests/typ/layout/math.typ b/tests/typ/math/simple.typ
index 55a853cf..55a853cf 100644
--- a/tests/typ/layout/math.typ
+++ b/tests/typ/math/simple.typ
diff --git a/tests/typ/style/document.typ b/tests/typ/meta/document.typ
index 1fcb8109..1fcb8109 100644
--- a/tests/typ/style/document.typ
+++ b/tests/typ/meta/document.typ
diff --git a/tests/typ/text/link.typ b/tests/typ/meta/link.typ
index 8c3e6ddd..8c3e6ddd 100644
--- a/tests/typ/text/link.typ
+++ b/tests/typ/meta/link.typ
diff --git a/tests/typ/text/case.typ b/tests/typ/text/case.typ
new file mode 100644
index 00000000..75574f21
--- /dev/null
+++ b/tests/typ/text/case.typ
@@ -0,0 +1,12 @@
+// Test the `upper` and `lower` functions.
+// Ref: false
+
+---
+#let memes = "ArE mEmEs gReAt?";
+#test(lower(memes), "are memes great?")
+#test(upper(memes), "ARE MEMES GREAT?")
+#test(upper("Ελλάδα"), "ΕΛΛΆΔΑ")
+
+---
+// Error: 8-9 expected string or content, found integer
+#upper(1)
diff --git a/tests/typ/text/emph-strong.typ b/tests/typ/text/emphasis.typ
index cd2191cc..cd2191cc 100644
--- a/tests/typ/text/emph-strong.typ
+++ b/tests/typ/text/emphasis.typ
diff --git a/tests/typ/text/code.typ b/tests/typ/text/raw-highlight.typ
index d89f1c05..d89f1c05 100644
--- a/tests/typ/text/code.typ
+++ b/tests/typ/text/raw-highlight.typ
diff --git a/tests/typ/text/shifts.typ b/tests/typ/text/shift.typ
index 01a83f6e..01a83f6e 100644
--- a/tests/typ/text/shifts.typ
+++ b/tests/typ/text/shift.typ
diff --git a/tests/typ/text/whitespace.typ b/tests/typ/text/space.typ
index 8dcc59e3..8dcc59e3 100644
--- a/tests/typ/text/whitespace.typ
+++ b/tests/typ/text/space.typ
diff --git a/tests/typ/graphics/image.typ b/tests/typ/visualize/image.typ
index e97365cd..6a2c37e1 100644
--- a/tests/typ/graphics/image.typ
+++ b/tests/typ/visualize/image.typ
@@ -51,7 +51,7 @@ A #image("/res/tiger.jpg", height: 1cm, width: 80%) B
 #image("/res/pattern.svg")
 
 ---
-// Error: 8-29 file not found (searched at typ/graphics/path/does/not/exist)
+// Error: 8-29 file not found (searched at typ/visualize/path/does/not/exist)
 #image("path/does/not/exist")
 
 ---
diff --git a/tests/typ/graphics/line.typ b/tests/typ/visualize/line.typ
index 2cb2fc9c..2cb2fc9c 100644
--- a/tests/typ/graphics/line.typ
+++ b/tests/typ/visualize/line.typ
diff --git a/tests/typ/graphics/shape-aspect.typ b/tests/typ/visualize/shape-aspect.typ
index f2dd9b51..f2dd9b51 100644
--- a/tests/typ/graphics/shape-aspect.typ
+++ b/tests/typ/visualize/shape-aspect.typ
diff --git a/tests/typ/graphics/shape-circle.typ b/tests/typ/visualize/shape-circle.typ
index 13ff67de..13ff67de 100644
--- a/tests/typ/graphics/shape-circle.typ
+++ b/tests/typ/visualize/shape-circle.typ
diff --git a/tests/typ/graphics/shape-ellipse.typ b/tests/typ/visualize/shape-ellipse.typ
index ba4d0d0a..ba4d0d0a 100644
--- a/tests/typ/graphics/shape-ellipse.typ
+++ b/tests/typ/visualize/shape-ellipse.typ
diff --git a/tests/typ/graphics/shape-fill-stroke.typ b/tests/typ/visualize/shape-fill-stroke.typ
index d14d0981..d14d0981 100644
--- a/tests/typ/graphics/shape-fill-stroke.typ
+++ b/tests/typ/visualize/shape-fill-stroke.typ
diff --git a/tests/typ/graphics/shape-rect.typ b/tests/typ/visualize/shape-rect.typ
index 94686da2..94686da2 100644
--- a/tests/typ/graphics/shape-rect.typ
+++ b/tests/typ/visualize/shape-rect.typ
diff --git a/tests/typ/graphics/shape-square.typ b/tests/typ/visualize/shape-square.typ
index 622fa9c8..622fa9c8 100644
--- a/tests/typ/graphics/shape-square.typ
+++ b/tests/typ/visualize/shape-square.typ