diff --git a/tests/corpus/compat_ampersands.txt b/tests/corpus/compat_ampersands.txt
new file mode 100644
index 0000000..1cd5f1b
--- /dev/null
+++ b/tests/corpus/compat_ampersands.txt
@@ -0,0 +1,3 @@
+&notanentity &copy &amp &lt &unknown;
+================================================================================
+&notanentity &copy &amp &lt &unknown;
diff --git a/tests/corpus/compat_cpp_references.txt b/tests/corpus/compat_cpp_references.txt
new file mode 100644
index 0000000..64bf993
--- /dev/null
+++ b/tests/corpus/compat_cpp_references.txt
@@ -0,0 +1,9 @@
+AddRequirements({&subsystem1, &subsystem2})
+zhash_put(zh, &key, &val, &old_key, &old_value)
+\copydetails DenseBase::operator=(const EigenBase<OtherDerived> &other)
+DerivedT &operator=(const DerivedT &R);
+================================================================================
+AddRequirements({&subsystem1, &subsystem2})
+zhash_put(zh, &key, &val, &old_key, &old_value)
+\copydetails DenseBase::operator=(const EigenBase<OtherDerived> &other)
+DerivedT &operator=(const DerivedT &R);
diff --git a/tests/corpus/compat_cpp_templates.txt b/tests/corpus/compat_cpp_templates.txt
new file mode 100644
index 0000000..d998242
--- /dev/null
+++ b/tests/corpus/compat_cpp_templates.txt
@@ -0,0 +1,3 @@
+std::vector<code> is valid.
+================================================================================
+std::vector<code> is valid.
diff --git a/tests/corpus/compat_incomplete_template.txt b/tests/corpus/compat_incomplete_template.txt
new file mode 100644
index 0000000..3e3398a
--- /dev/null
+++ b/tests/corpus/compat_incomplete_template.txt
@@ -0,0 +1,3 @@
+std::vector<T
+================================================================================
+std::vector<T
diff --git a/tests/corpus/compat_inline_literals.txt b/tests/corpus/compat_inline_literals.txt
new file mode 100644
index 0000000..81ca467
--- /dev/null
+++ b/tests/corpus/compat_inline_literals.txt
@@ -0,0 +1,27 @@
+Use {@code <code>value</code>} here.
+Use {@code <a href="x">text</a>} here.
+Use {@code <table><tr><td>value</td></tr></table>} here.
+Use {@code std::vector<T} here.
+Use {@code a &copy; b &other} here.
+Use {@code <!-- text -->} here.
+
+Use ``<code>value</code>`` here.
+Use ``<a href="x">text</a>`` here.
+Use ``<table><tr><td>value</td></tr></table>`` here.
+Use ``std::vector<T`` here.
+Use ``a &copy; b &other`` here.
+Use ``<!-- text -->`` here.
+================================================================================
+Use ``<code>value</code>`` here.
+Use ``<a href="x">text</a>`` here.
+Use ``<table><tr><td>value</td></tr></table>`` here.
+Use ``std::vector<T`` here.
+Use ``a &copy; b &other`` here.
+Use ``<!-- text -->`` here.
+
+Use ``<code>value</code>`` here.
+Use ``<a href="x">text</a>`` here.
+Use ``<table><tr><td>value</td></tr></table>`` here.
+Use ``std::vector<T`` here.
+Use ``a &copy; b &other`` here.
+Use ``<!-- text -->`` here.
diff --git a/tests/corpus/compat_irregular_table.txt b/tests/corpus/compat_irregular_table.txt
new file mode 100644
index 0000000..a5b8640
--- /dev/null
+++ b/tests/corpus/compat_irregular_table.txt
@@ -0,0 +1,3 @@
+<table><tr><td colspan="2">&other <!-- keep --> <T</td></tr></table>
+================================================================================
+<table><tr><td colspan="2">&other <!-- keep --> <T</td></tr></table>
diff --git a/tests/corpus/compat_unknown_markup.txt b/tests/corpus/compat_unknown_markup.txt
new file mode 100644
index 0000000..59662ea
--- /dev/null
+++ b/tests/corpus/compat_unknown_markup.txt
@@ -0,0 +1,7 @@
+Text <Unknown>stuff</Unknown>.
+Writes XML comment as "<!-- text -->"
+Writes XML comment as "<!-- text -- >"
+================================================================================
+Text <Unknown>stuff</Unknown>.
+Writes XML comment as "<!-- text -->"
+Writes XML comment as "<!-- text -- >"
diff --git a/tests/corpus/enum_inline.txt b/tests/corpus/enum_inline.txt
new file mode 100644
index 0000000..9eb4204
--- /dev/null
+++ b/tests/corpus/enum_inline.txt
@@ -0,0 +1,3 @@
+/**< input to user code from the simulator */
+================================================================================
+input to user code from the simulator
diff --git a/tests/corpus/html_whitespace.txt b/tests/corpus/html_whitespace.txt
new file mode 100644
index 0000000..d20a217
--- /dev/null
+++ b/tests/corpus/html_whitespace.txt
@@ -0,0 +1,15 @@
+  /**
+   * Get the raw output ratio of the duty cycle signal.
+   *
+   * <p> 0 means always low, an output equal to
+   * GetOutputScaleFactor() means always high.
+   *
+   * @return output ratio in raw units
+   */
+================================================================================
+Get the raw output ratio of the duty cycle signal.
+
+0 means always low, an output equal to
+GetOutputScaleFactor() means always high.
+
+:returns: output ratio in raw units
diff --git a/tests/corpus/link_class_javadoc.txt b/tests/corpus/link_class_javadoc.txt
new file mode 100644
index 0000000..a883586
--- /dev/null
+++ b/tests/corpus/link_class_javadoc.txt
@@ -0,0 +1,11 @@
+  /**
+   * Use this method to define your button->command mappings. Buttons can be created by
+   * instantiating a {@link GenericHID} or one of its subclasses ({@link
+   * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then calling passing it to a
+   * {@link edu.wpi.first.wpilibj2.command.button.JoystickButton}.
+   */
+================================================================================
+Use this method to define your button->command mappings. Buttons can be created by
+instantiating a :class:`.GenericHID` or one of its subclasses ({@link
+edu.wpi.first.wpilibj.Joystick} or :class:`.XboxController`), and then calling passing it to a
+:class:`.JoystickButton`.
diff --git a/tests/corpus/multiple_single_line.txt b/tests/corpus/multiple_single_line.txt
new file mode 100644
index 0000000..ac10c86
--- /dev/null
+++ b/tests/corpus/multiple_single_line.txt
@@ -0,0 +1,5 @@
+/// Some text goes here.
+/// More text.
+================================================================================
+Some text goes here.
+More text.
diff --git a/tests/corpus/note_multiline.txt b/tests/corpus/note_multiline.txt
new file mode 100644
index 0000000..b27cde8
--- /dev/null
+++ b/tests/corpus/note_multiline.txt
@@ -0,0 +1,15 @@
+/**
+ * This is a paragraph.
+ *
+ * @note This is the start of a note that goes over multiple lines.
+ *     This should still be part of the note.
+ *
+ * @return entry
+ */
+================================================================================
+This is a paragraph.
+
+.. note:: This is the start of a note that goes over multiple lines.
+   This should still be part of the note.
+
+:returns: entry
diff --git a/tests/corpus/note_one_line.txt b/tests/corpus/note_one_line.txt
new file mode 100644
index 0000000..3030f74
--- /dev/null
+++ b/tests/corpus/note_one_line.txt
@@ -0,0 +1,9 @@
+/**
+ * NetworkTables struct-encoded value entry.
+ *
+ * @note Unlike NetworkTableEntry, the entry goes away when this is destroyed.
+ */
+================================================================================
+NetworkTables struct-encoded value entry.
+
+.. note:: Unlike NetworkTableEntry, the entry goes away when this is destroyed.
diff --git a/tests/corpus/param_no_indent.txt b/tests/corpus/param_no_indent.txt
new file mode 100644
index 0000000..1abd802
--- /dev/null
+++ b/tests/corpus/param_no_indent.txt
@@ -0,0 +1,23 @@
+*
+* Sends an error to the driver station.
+*
+* @param isError   true for error, false for warning
+* @param errorCode the error code
+* @param isLVCode  true for a LV error code, false for a standard error code
+* @param details   the details of the error
+* @param location  the file location of the errror
+* @param callstack the callstack of the error
+* @param printMsg  true to print the error message to stdout as well as to the
+* DS
+*/
+================================================================================
+Sends an error to the driver station.
+
+:param isError:   true for error, false for warning
+:param errorCode: the error code
+:param isLVCode:  true for a LV error code, false for a standard error code
+:param details:   the details of the error
+:param location:  the file location of the errror
+:param callstack: the callstack of the error
+:param printMsg:  true to print the error message to stdout as well as to the
+                  DS
diff --git a/tests/corpus/simple_maths.txt b/tests/corpus/simple_maths.txt
new file mode 100644
index 0000000..b5e7fe7
--- /dev/null
+++ b/tests/corpus/simple_maths.txt
@@ -0,0 +1,9 @@
+This is known to be broken. Output should include an escaped space before the role.
+
+x<sub>1</sub>
+x<sup>2</sup>
+================================================================================
+This is known to be broken. Output should include an escaped space before the role.
+
+x:sub:`1`
+x:sup:`2`
diff --git a/tests/corpus/snake_case_words.txt b/tests/corpus/snake_case_words.txt
new file mode 100644
index 0000000..f2b7042
--- /dev/null
+++ b/tests/corpus/snake_case_words.txt
@@ -0,0 +1,3 @@
+scale_value(joystick.getThrottle(), 1, -1, 0, 1)
+================================================================================
+scale_value(joystick.getThrottle(), 1, -1, 0, 1)
diff --git a/tests/corpus/tag_soup.txt b/tests/corpus/tag_soup.txt
new file mode 100644
index 0000000..36bff8e
--- /dev/null
+++ b/tests/corpus/tag_soup.txt
@@ -0,0 +1,23 @@
+be <b>bold</b>
+be <strong>strong</strong>
+<i>italics</i>
+<em>emphasis</em>
+<sub>subscript</sub>
+<sup>superscript</sup>
+
+<strong>multiline
+  strong</strong>
+<i>multiline
+  italics</i>
+================================================================================
+be **bold**
+be **strong**
+*italics*
+*emphasis*
+:sub:`subscript`
+:sup:`superscript`
+
+:strong:`multiline
+strong`
+:emphasis:`multiline
+italics`
diff --git a/tests/corpus/trailing_underscores.txt b/tests/corpus/trailing_underscores.txt
new file mode 100644
index 0000000..a25e13a
--- /dev/null
+++ b/tests/corpus/trailing_underscores.txt
@@ -0,0 +1,3 @@
+...target storage, FRC_ log files are deleted...
+================================================================================
+...target storage, FRC\_ log files are deleted...
diff --git a/tests/corpus/underscore_word.txt b/tests/corpus/underscore_word.txt
new file mode 100644
index 0000000..5b40b7a
--- /dev/null
+++ b/tests/corpus/underscore_word.txt
@@ -0,0 +1,3 @@
+a sentence where _ is a word
+================================================================================
+a sentence where _ is a word
diff --git a/tests/expected/compat_ampersands.txt b/tests/expected/compat_ampersands.txt
deleted file mode 100644
index 946af92..0000000
--- a/tests/expected/compat_ampersands.txt
+++ /dev/null
@@ -1 +0,0 @@
-&notanentity &copy &amp &lt &unknown;
diff --git a/tests/expected/compat_cpp_references.txt b/tests/expected/compat_cpp_references.txt
deleted file mode 100644
index 563f14c..0000000
--- a/tests/expected/compat_cpp_references.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-AddRequirements({&subsystem1, &subsystem2})
-zhash_put(zh, &key, &val, &old_key, &old_value)
-\copydetails DenseBase::operator=(const EigenBase<OtherDerived> &other)
-DerivedT &operator=(const DerivedT &R);
diff --git a/tests/expected/compat_cpp_templates.txt b/tests/expected/compat_cpp_templates.txt
deleted file mode 100644
index 0d3c672..0000000
--- a/tests/expected/compat_cpp_templates.txt
+++ /dev/null
@@ -1 +0,0 @@
-std::vector<code> is valid.
diff --git a/tests/expected/compat_incomplete_template.txt b/tests/expected/compat_incomplete_template.txt
deleted file mode 100644
index ffea4fe..0000000
--- a/tests/expected/compat_incomplete_template.txt
+++ /dev/null
@@ -1 +0,0 @@
-std::vector<T
diff --git a/tests/expected/compat_inline_literals.txt b/tests/expected/compat_inline_literals.txt
deleted file mode 100644
index 84a2c9f..0000000
--- a/tests/expected/compat_inline_literals.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Use ``<code>value</code>`` here.
-Use ``<a href="x">text</a>`` here.
-Use ``<table><tr><td>value</td></tr></table>`` here.
-Use ``std::vector<T`` here.
-Use ``a &copy; b &other`` here.
-Use ``<!-- text -->`` here.
-
-Use ``<code>value</code>`` here.
-Use ``<a href="x">text</a>`` here.
-Use ``<table><tr><td>value</td></tr></table>`` here.
-Use ``std::vector<T`` here.
-Use ``a &copy; b &other`` here.
-Use ``<!-- text -->`` here.
diff --git a/tests/expected/compat_irregular_table.txt b/tests/expected/compat_irregular_table.txt
deleted file mode 100644
index 002ebbb..0000000
--- a/tests/expected/compat_irregular_table.txt
+++ /dev/null
@@ -1 +0,0 @@
-<table><tr><td colspan="2">&other <!-- keep --> <T</td></tr></table>
diff --git a/tests/expected/compat_unknown_markup.txt b/tests/expected/compat_unknown_markup.txt
deleted file mode 100644
index 92efe68..0000000
--- a/tests/expected/compat_unknown_markup.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Text <Unknown>stuff</Unknown>.
-Writes XML comment as "<!-- text -->"
-Writes XML comment as "<!-- text -- >"
diff --git a/tests/expected/enum_inline.txt b/tests/expected/enum_inline.txt
deleted file mode 100644
index 991ee70..0000000
--- a/tests/expected/enum_inline.txt
+++ /dev/null
@@ -1 +0,0 @@
-input to user code from the simulator
diff --git a/tests/expected/html_whitespace.txt b/tests/expected/html_whitespace.txt
deleted file mode 100644
index 36a40b7..0000000
--- a/tests/expected/html_whitespace.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Get the raw output ratio of the duty cycle signal.
-
-0 means always low, an output equal to
-GetOutputScaleFactor() means always high.
-
-:returns: output ratio in raw units
diff --git a/tests/expected/link_class_javadoc.txt b/tests/expected/link_class_javadoc.txt
deleted file mode 100644
index 6c74144..0000000
--- a/tests/expected/link_class_javadoc.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Use this method to define your button->command mappings. Buttons can be created by
-instantiating a :class:`.GenericHID` or one of its subclasses ({@link
-edu.wpi.first.wpilibj.Joystick} or :class:`.XboxController`), and then calling passing it to a
-:class:`.JoystickButton`.
diff --git a/tests/expected/multiple_single_line.txt b/tests/expected/multiple_single_line.txt
deleted file mode 100644
index 26b9ad9..0000000
--- a/tests/expected/multiple_single_line.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Some text goes here.
-More text.
diff --git a/tests/expected/note_multiline.txt b/tests/expected/note_multiline.txt
deleted file mode 100644
index baf1ee0..0000000
--- a/tests/expected/note_multiline.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a paragraph.
-
-.. note:: This is the start of a note that goes over multiple lines.
-   This should still be part of the note.
-
-:returns: entry
diff --git a/tests/expected/note_one_line.txt b/tests/expected/note_one_line.txt
deleted file mode 100644
index 8e8be9c..0000000
--- a/tests/expected/note_one_line.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-NetworkTables struct-encoded value entry.
-
-.. note:: Unlike NetworkTableEntry, the entry goes away when this is destroyed.
diff --git a/tests/expected/param_no_indent.txt b/tests/expected/param_no_indent.txt
deleted file mode 100644
index fe7694a..0000000
--- a/tests/expected/param_no_indent.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Sends an error to the driver station.
-
-:param isError:   true for error, false for warning
-:param errorCode: the error code
-:param isLVCode:  true for a LV error code, false for a standard error code
-:param details:   the details of the error
-:param location:  the file location of the errror
-:param callstack: the callstack of the error
-:param printMsg:  true to print the error message to stdout as well as to the
-                  DS
diff --git a/tests/expected/simple_maths.txt b/tests/expected/simple_maths.txt
deleted file mode 100644
index 39e4247..0000000
--- a/tests/expected/simple_maths.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is known to be broken. Output should include an escaped space before the role.
-
-x:sub:`1`
-x:sup:`2`
diff --git a/tests/expected/snake_case_words.txt b/tests/expected/snake_case_words.txt
deleted file mode 100644
index 535c657..0000000
--- a/tests/expected/snake_case_words.txt
+++ /dev/null
@@ -1 +0,0 @@
-scale_value(joystick.getThrottle(), 1, -1, 0, 1)
diff --git a/tests/expected/tag_soup.txt b/tests/expected/tag_soup.txt
deleted file mode 100644
index a2f478f..0000000
--- a/tests/expected/tag_soup.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-be **bold**
-be **strong**
-*italics*
-*emphasis*
-:sub:`subscript`
-:sup:`superscript`
-
-:strong:`multiline
-strong`
-:emphasis:`multiline
-italics`
diff --git a/tests/expected/trailing_underscores.txt b/tests/expected/trailing_underscores.txt
deleted file mode 100644
index 0776de6..0000000
--- a/tests/expected/trailing_underscores.txt
+++ /dev/null
@@ -1 +0,0 @@
-...target storage, FRC\_ log files are deleted...
diff --git a/tests/expected/underscore_word.txt b/tests/expected/underscore_word.txt
deleted file mode 100644
index eff7c34..0000000
--- a/tests/expected/underscore_word.txt
+++ /dev/null
@@ -1 +0,0 @@
-a sentence where _ is a word
diff --git a/tests/input/compat_ampersands.txt b/tests/input/compat_ampersands.txt
deleted file mode 100644
index 946af92..0000000
--- a/tests/input/compat_ampersands.txt
+++ /dev/null
@@ -1 +0,0 @@
-&notanentity &copy &amp &lt &unknown;
diff --git a/tests/input/compat_cpp_references.txt b/tests/input/compat_cpp_references.txt
deleted file mode 100644
index 563f14c..0000000
--- a/tests/input/compat_cpp_references.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-AddRequirements({&subsystem1, &subsystem2})
-zhash_put(zh, &key, &val, &old_key, &old_value)
-\copydetails DenseBase::operator=(const EigenBase<OtherDerived> &other)
-DerivedT &operator=(const DerivedT &R);
diff --git a/tests/input/compat_cpp_templates.txt b/tests/input/compat_cpp_templates.txt
deleted file mode 100644
index 0d3c672..0000000
--- a/tests/input/compat_cpp_templates.txt
+++ /dev/null
@@ -1 +0,0 @@
-std::vector<code> is valid.
diff --git a/tests/input/compat_incomplete_template.txt b/tests/input/compat_incomplete_template.txt
deleted file mode 100644
index ffea4fe..0000000
--- a/tests/input/compat_incomplete_template.txt
+++ /dev/null
@@ -1 +0,0 @@
-std::vector<T
diff --git a/tests/input/compat_inline_literals.txt b/tests/input/compat_inline_literals.txt
deleted file mode 100644
index 861259e..0000000
--- a/tests/input/compat_inline_literals.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Use {@code <code>value</code>} here.
-Use {@code <a href="x">text</a>} here.
-Use {@code <table><tr><td>value</td></tr></table>} here.
-Use {@code std::vector<T} here.
-Use {@code a &copy; b &other} here.
-Use {@code <!-- text -->} here.
-
-Use ``<code>value</code>`` here.
-Use ``<a href="x">text</a>`` here.
-Use ``<table><tr><td>value</td></tr></table>`` here.
-Use ``std::vector<T`` here.
-Use ``a &copy; b &other`` here.
-Use ``<!-- text -->`` here.
diff --git a/tests/input/compat_irregular_table.txt b/tests/input/compat_irregular_table.txt
deleted file mode 100644
index 002ebbb..0000000
--- a/tests/input/compat_irregular_table.txt
+++ /dev/null
@@ -1 +0,0 @@
-<table><tr><td colspan="2">&other <!-- keep --> <T</td></tr></table>
diff --git a/tests/input/compat_unknown_markup.txt b/tests/input/compat_unknown_markup.txt
deleted file mode 100644
index 92efe68..0000000
--- a/tests/input/compat_unknown_markup.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Text <Unknown>stuff</Unknown>.
-Writes XML comment as "<!-- text -->"
-Writes XML comment as "<!-- text -- >"
diff --git a/tests/input/enum_inline.txt b/tests/input/enum_inline.txt
deleted file mode 100644
index 48388cd..0000000
--- a/tests/input/enum_inline.txt
+++ /dev/null
@@ -1 +0,0 @@
-/**< input to user code from the simulator */
diff --git a/tests/input/html_whitespace.txt b/tests/input/html_whitespace.txt
deleted file mode 100644
index beae1be..0000000
--- a/tests/input/html_whitespace.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-  /**
-   * Get the raw output ratio of the duty cycle signal.
-   *
-   * <p> 0 means always low, an output equal to
-   * GetOutputScaleFactor() means always high.
-   *
-   * @return output ratio in raw units
-   */
diff --git a/tests/input/link_class_javadoc.txt b/tests/input/link_class_javadoc.txt
deleted file mode 100644
index 8618be9..0000000
--- a/tests/input/link_class_javadoc.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-  /**
-   * Use this method to define your button->command mappings. Buttons can be created by
-   * instantiating a {@link GenericHID} or one of its subclasses ({@link
-   * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then calling passing it to a
-   * {@link edu.wpi.first.wpilibj2.command.button.JoystickButton}.
-   */
diff --git a/tests/input/multiple_single_line.txt b/tests/input/multiple_single_line.txt
deleted file mode 100644
index 574486d..0000000
--- a/tests/input/multiple_single_line.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-/// Some text goes here.
-/// More text.
diff --git a/tests/input/note_multiline.txt b/tests/input/note_multiline.txt
deleted file mode 100644
index aef8429..0000000
--- a/tests/input/note_multiline.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * This is a paragraph.
- *
- * @note This is the start of a note that goes over multiple lines.
- *     This should still be part of the note.
- *
- * @return entry
- */
diff --git a/tests/input/note_one_line.txt b/tests/input/note_one_line.txt
deleted file mode 100644
index 5be0b7b..0000000
--- a/tests/input/note_one_line.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * NetworkTables struct-encoded value entry.
- *
- * @note Unlike NetworkTableEntry, the entry goes away when this is destroyed.
- */
diff --git a/tests/input/param_no_indent.txt b/tests/input/param_no_indent.txt
deleted file mode 100644
index 676c820..0000000
--- a/tests/input/param_no_indent.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*
-* Sends an error to the driver station.
-*
-* @param isError   true for error, false for warning
-* @param errorCode the error code
-* @param isLVCode  true for a LV error code, false for a standard error code
-* @param details   the details of the error
-* @param location  the file location of the errror
-* @param callstack the callstack of the error
-* @param printMsg  true to print the error message to stdout as well as to the
-* DS
-*/
diff --git a/tests/input/simple_maths.txt b/tests/input/simple_maths.txt
deleted file mode 100644
index cf8eac3..0000000
--- a/tests/input/simple_maths.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is known to be broken. Output should include an escaped space before the role.
-
-x<sub>1</sub>
-x<sup>2</sup>
diff --git a/tests/input/snake_case_words.txt b/tests/input/snake_case_words.txt
deleted file mode 100644
index 535c657..0000000
--- a/tests/input/snake_case_words.txt
+++ /dev/null
@@ -1 +0,0 @@
-scale_value(joystick.getThrottle(), 1, -1, 0, 1)
diff --git a/tests/input/tag_soup.txt b/tests/input/tag_soup.txt
deleted file mode 100644
index 77cc536..0000000
--- a/tests/input/tag_soup.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-be <b>bold</b>
-be <strong>strong</strong>
-<i>italics</i>
-<em>emphasis</em>
-<sub>subscript</sub>
-<sup>superscript</sup>
-
-<strong>multiline
-  strong</strong>
-<i>multiline
-  italics</i>
diff --git a/tests/input/trailing_underscores.txt b/tests/input/trailing_underscores.txt
deleted file mode 100644
index 609d630..0000000
--- a/tests/input/trailing_underscores.txt
+++ /dev/null
@@ -1 +0,0 @@
-...target storage, FRC_ log files are deleted...
diff --git a/tests/input/underscore_word.txt b/tests/input/underscore_word.txt
deleted file mode 100644
index eff7c34..0000000
--- a/tests/input/underscore_word.txt
+++ /dev/null
@@ -1 +0,0 @@
-a sentence where _ is a word
diff --git a/tests/test_corpus.py b/tests/test_corpus.py
index 1d2e759..8f63311 100644
--- a/tests/test_corpus.py
+++ b/tests/test_corpus.py
@@ -10,20 +10,57 @@
 TESTS_DIR = Path(__file__).resolve().parent
 
 
+def read_corpus(path):
+    lines = path.read_bytes().splitlines(keepends=True)
+    separators = [i for i, line in enumerate(lines) if line == b"=" * 80 + b"\n"]
+    if len(separators) != 1:
+        raise ValueError(
+            f"{path}: expected exactly one separator line of 80 '=' characters"
+        )
+    index = separators[0]
+    return b"".join(lines[:index]), b"".join(lines[index + 1 :])
+
+
+def test_read_corpus_preserves_whitespace(tmp_path):
+    path = tmp_path / "case.txt"
+    path.write_bytes(b"/** raw */  \n\n" + b"=" * 80 + b"\n\n  output  \n\n")
+
+    assert read_corpus(path) == (b"/** raw */  \n\n", b"\n  output  \n\n")
+
+
+@pytest.mark.parametrize(
+    "contents",
+    [
+        b"no separator\n",
+        b"=" * 79 + b"\n",
+        b"=" * 81 + b"\n",
+        b"prefix" + b"=" * 80 + b"\n",
+        (b"=" * 80 + b"\n") * 2,
+    ],
+)
+def test_read_corpus_rejects_invalid_separator(tmp_path, contents):
+    path = tmp_path / "case.txt"
+    path.write_bytes(contents)
+
+    with pytest.raises(ValueError, match="exactly one separator"):
+        read_corpus(path)
+
+
 @pytest.mark.parametrize(
-    "input_path",
-    sorted((TESTS_DIR / "input").glob("*.txt")),
+    "corpus_path",
+    sorted((TESTS_DIR / "corpus").glob("*.txt")),
     ids=lambda path: path.name,
 )
-def test_raw_corpus(input_path, monkeypatch):
+def test_raw_corpus(corpus_path, monkeypatch):
+    raw, expected = read_corpus(corpus_path)
     result = subprocess.run(
         [sys.executable, "-m", "sphinxify", "raw"],
-        input=input_path.read_bytes(),
+        input=raw,
         capture_output=True,
         check=True,
     )
 
-    assert result.stdout == (TESTS_DIR / "expected" / input_path.name).read_bytes()
+    assert result.stdout == expected
 
     # Accept the corpus's Sphinx role without resolving its cross-reference.
     # Isolate docutils' process-global registry so other tests are unaffected.