diff --git a/src/library/base.rs b/src/library/basic.rs
similarity index 100%
rename from src/library/base.rs
rename to src/library/basic.rs
diff --git a/src/library/mod.rs b/src/library/mod.rs
index 9c2a661a6..738348ee0 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -4,7 +4,7 @@
 //! definitions.
 
 mod align;
-mod base;
+mod basic;
 mod font;
 mod image;
 mod lang;
@@ -17,7 +17,7 @@ mod spacing;
 
 pub use self::image::*;
 pub use align::*;
-pub use base::*;
+pub use basic::*;
 pub use font::*;
 pub use lang::*;
 pub use markup::*;
diff --git a/tests/ref/markup/basic.png b/tests/ref/markup/basic.png
new file mode 100644
index 000000000..a43fcbcbc
Binary files /dev/null and b/tests/ref/markup/basic.png differ
diff --git a/tests/ref/markup/linebreak.png b/tests/ref/markup/linebreak.png
deleted file mode 100644
index 32236e742..000000000
Binary files a/tests/ref/markup/linebreak.png and /dev/null differ
diff --git a/tests/ref/markup/nbsp.png b/tests/ref/markup/nbsp.png
deleted file mode 100644
index 8834bb2bc..000000000
Binary files a/tests/ref/markup/nbsp.png and /dev/null differ
diff --git a/tests/ref/markup/parbreak.png b/tests/ref/markup/parbreak.png
deleted file mode 100644
index f100b9d73..000000000
Binary files a/tests/ref/markup/parbreak.png and /dev/null differ
diff --git a/tests/ref/text/complex.png b/tests/ref/text/shaping.png
similarity index 100%
rename from tests/ref/text/complex.png
rename to tests/ref/text/shaping.png
diff --git a/tests/typ/library/base.typ b/tests/typ/library/basic.typ
similarity index 95%
rename from tests/typ/library/base.typ
rename to tests/typ/library/basic.typ
index cc9f14a03..a16215a75 100644
--- a/tests/typ/library/base.typ
+++ b/tests/typ/library/basic.typ
@@ -1,4 +1,4 @@
-// Test the base functions.
+// Test basic functions.
 // Ref: false
 
 ---
diff --git a/tests/typ/markup/basic.typ b/tests/typ/markup/basic.typ
new file mode 100644
index 000000000..3e83b9113
--- /dev/null
+++ b/tests/typ/markup/basic.typ
@@ -0,0 +1,22 @@
+// Test basic markup.
+
+---
+#let linebreak() = [
+    // Inside the old line break definition is still active.
+    #circle(radius: 2pt, fill: #000) \
+]
+
+A \ B \ C
+
+---
+// Paragraph breaks don't exist!
+#let parbreak() = [ ]
+
+No more
+
+paragraph breaks
+
+for you!
+
+---
+The non-breaking~space does work.
diff --git a/tests/typ/markup/linebreak.typ b/tests/typ/markup/linebreak.typ
deleted file mode 100644
index b1b83dcc8..000000000
--- a/tests/typ/markup/linebreak.typ
+++ /dev/null
@@ -1,25 +0,0 @@
-// Test forced line breaks.
-
----
-// Directly after word.
-Line\ Break
-
-// Spaces around.
-Line \ Break
-
-// Directly before word does not work.
-No \Break
-
-\ Before
-
-Multiple \ \ \
-
-Times
-
----
-#let linebreak() = [
-    // Inside the old line break definition is still active.
-    #circle(radius: 2pt, fill: #000) \
-]
-
-A \ B \ C
diff --git a/tests/typ/markup/nbsp.typ b/tests/typ/markup/nbsp.typ
deleted file mode 100644
index 372268eb5..000000000
--- a/tests/typ/markup/nbsp.typ
+++ /dev/null
@@ -1,4 +0,0 @@
-// Test the non breaking space.
-
----
-The non-breaking~space does work.
diff --git a/tests/typ/markup/parbreak.typ b/tests/typ/markup/parbreak.typ
deleted file mode 100644
index b9b8a222d..000000000
--- a/tests/typ/markup/parbreak.typ
+++ /dev/null
@@ -1,11 +0,0 @@
-// Test paragraph breaks.
-
----
-// Paragraph breaks don't exist!
-#let parbreak() = [ ]
-
-No more
-
-paragraph breaks
-
-for you!
diff --git a/tests/typ/text/complex.typ b/tests/typ/text/shaping.typ
similarity index 100%
rename from tests/typ/text/complex.typ
rename to tests/typ/text/shaping.typ