Simplify fill-tests.el and add tests

Simplify fill-tests.el by grouping similar tests in the same
erts file.  Move the test code into the erts files, so it is
closer to the test cases, which provides context.  Add basic
test cases for common filling operations and for the scenarios
described in Bug#79575.

* test/lisp/textmodes/fill-tests.el (fill-test-end-period)
(fill-test-haskell): Rename from `test-fill-end-period' and
`test-fill-haskell' to follow the same naming convention of
the other tests.
(fill-test-fill-region-as-paragraph-default)
(fill-test-fill-region-as-paragraph-semlf)
(fill-test-fill-region-as-paragraph, fill-test-fill-region)
(fill-test-fill-paragraph, fill-test-fill-paragraph-semlf):
Group tests and move test code into erts files.
(fill-test-fill-paragraph-semlf-emacs-lisp-mode)
(fill-test-fill-paragraph-semlf-c-mode)
(fill-test-fill-paragraph-semlf-org-mode)
(fill-test-fill-paragraph-semlf-markdown-mode): Rename from
`fill-test-semlf-emacs-lisp-mode', `fill-test-semlf-c-mode',
`fill-test-semlf-org-mode' and
`fill-test-semlf-markdown-mode'.  Move test code into erts
files.
(fill-test-semlf, fill-test-semlf-fill-region)
(fill-test-semlf-justify)
(fill-test-semlf-sentence-end-double-space)
(fill-test-semlf-fill-column)
(fill-test-semlf-punctuation-marks, fill-test-semlf-twice)
(fill-test-semlf-fill-prefix, fill-test-semlf-indented-block)
(fill-test-semlf-revert): Delete tests since they are now
grouped with other tests.

* test/lisp/textmodes/fill-resources/fill-paragraph.erts:
* test/lisp/textmodes/fill-resources/fill-paragraph-semlf.erts:
* test/lisp/textmodes/fill-resources/fill-region-as-paragraph.erts:
* test/lisp/textmodes/fill-resources/fill-region-as-paragraph-default.erts:
* test/lisp/textmodes/fill-resources/fill-region-as-paragraph-semlf.erts:
Add test cases for the function specified in the file name,
including tests for the scenarios described in the bug report.
* test/lisp/textmodes/fill-resources/fill-region.erts: Add
test case for custom `fill-region-as-paragraph-function',
include test code in the test specification.
* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-c-mode.erts:
* test/lisp/textmodes/fill-resources/
fill-paragraph-semlf-emacs-lisp-mode.erts:
* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-markdown-mode.erts:
* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-org-mode.erts:
Rename from semlf-*-mode.erts, prefix test names with the
tested function and include test code in the test
specification.
* test/lisp/textmodes/fill-resources/semlf-fill-column.erts:
* test/lisp/textmodes/fill-resources/semlf-fill-prefix.erts:
* test/lisp/textmodes/fill-resources/semlf-fill-region.erts:
* test/lisp/textmodes/fill-resources/semlf-fill-region-as-paragraph.erts:
* test/lisp/textmodes/fill-resources/semlf-indented-block.erts:
* test/lisp/textmodes/fill-resources/semlf-justify.erts:
* test/lisp/textmodes/fill-resources/semlf-punctuation-marks.erts:
* test/lisp/textmodes/fill-resources/semlf-revert.erts:
* test/lisp/textmodes/fill-resources/semlf-sentence-end-double-space.erts:
* test/lisp/textmodes/fill-resources/semlf-twice.erts:
* test/lisp/textmodes/fill-resources/semlf.erts: Delete
files.  (Bug#79575)

21 files changed, 800 insertions, 401 deletions

diff --git a/test/lisp/textmodes/fill-resources/semlf-c-mode.erts b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-c-mode.erts
index a28eb68cfc6..4325df36b9f 100644
--- a/test/lisp/textmodes/fill-resources/semlf-c-mode.erts
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-c-mode.erts
@@ -1,6 +1,11 @@
 Point-Char: |
 
-Name: c-mode - single-line
+Code:
+  (lambda ()
+    (c-mode)
+    (fill-paragraph-semlf))
+
+Name: fill-paragraph-semlf - c-mode - single-line
 
 =-=
 // Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -13,7 +18,7 @@ Name: c-mode - single-line
 // veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: c-mode - single-line - fill-prefix - marker
+Name: fill-paragraph-semlf - c-mode - single-line - fill-prefix - marker
 
 =-=
 // - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -31,7 +36,7 @@ Name: c-mode - single-line - fill-prefix - marker
 // - officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: c-mode - single-line - fill-prefix - whitespace
+Name: fill-paragraph-semlf - c-mode - single-line - fill-prefix - whitespace
 
 =-=
 // - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -49,7 +54,7 @@ Name: c-mode - single-line - fill-prefix - whitespace
 //   officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: c-mode - single-line - indented block
+Name: fill-paragraph-semlf - c-mode - single-line - indented block
 
 =-=
 // Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -83,7 +88,7 @@ Name: c-mode - single-line - indented block
 // nisi ut.
 =-=-=
 
-Name: c-mode - multi-line
+Name: fill-paragraph-semlf - c-mode - multi-line
 
 =-=
 /*
@@ -100,7 +105,7 @@ Name: c-mode - multi-line
  */
 =-=-=
 
-Name: c-mode - multi-line - fill-prefix - marker
+Name: fill-paragraph-semlf - c-mode - multi-line - fill-prefix - marker
 
 =-=
 /*
@@ -122,7 +127,7 @@ Name: c-mode - multi-line - fill-prefix - marker
  */
 =-=-=
 
-Name: c-mode - multi-line - fill-prefix - whitespace
+Name: fill-paragraph-semlf - c-mode - multi-line - fill-prefix - whitespace
 
 =-=
 /*
@@ -144,7 +149,7 @@ Name: c-mode - multi-line - fill-prefix - whitespace
  */
 =-=-=
 
-Name: c-mode - multi-line - indented block
+Name: fill-paragraph-semlf - c-mode - multi-line - indented block
 
 =-=
 /*
diff --git a/test/lisp/textmodes/fill-resources/semlf-emacs-lisp-mode.erts b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-emacs-lisp-mode.erts
index 1623b0dcf8a..db54da0b1b6 100644
--- a/test/lisp/textmodes/fill-resources/semlf-emacs-lisp-mode.erts
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-emacs-lisp-mode.erts
@@ -1,6 +1,11 @@
 Point-Char: |
 
-Name: emacs-lisp-mode
+Code:
+  (lambda ()
+    (emacs-lisp-mode)
+    (fill-paragraph-semlf))
+
+Name: fill-paragraph-semlf - emacs-lisp-mode
 
 =-=
 ;; Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -13,7 +18,7 @@ Name: emacs-lisp-mode
 ;; veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: emacs-lisp-mode - fill-prefix - marker
+Name: fill-paragraph-semlf - emacs-lisp-mode - fill-prefix - marker
 
 =-=
 ;; - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -31,7 +36,7 @@ Name: emacs-lisp-mode - fill-prefix - marker
 ;; - officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: emacs-lisp-mode - fill-prefix - whitespace
+Name: fill-paragraph-semlf - emacs-lisp-mode - fill-prefix - whitespace
 
 =-=
 ;; - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -49,7 +54,7 @@ Name: emacs-lisp-mode - fill-prefix - whitespace
 ;;   officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: emacs-lisp-mode - indented block
+Name: fill-paragraph-semlf - emacs-lisp-mode - indented block
 
 The `fill-forward-paragraph' function jumps to the beginning/end of
 the comment.
diff --git a/test/lisp/textmodes/fill-resources/semlf-markdown-mode.erts b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-markdown-mode.erts
index 7257708c245..5e0f6617b98 100644
--- a/test/lisp/textmodes/fill-resources/semlf-markdown-mode.erts
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-markdown-mode.erts
@@ -1,6 +1,11 @@
 Point-Char: |
 
-Name: markdown-mode
+Code:
+  (lambda ()
+    (markdown-mode)
+    (fill-paragraph-semlf))
+
+Name: fill-paragraph-semlf - markdown-mode
 
 =-=
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -13,7 +18,7 @@ Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: markdown-mode - list - one single-line item
+Name: fill-paragraph-semlf - markdown-mode - list - one single-line item
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -24,7 +29,7 @@ Name: markdown-mode - list - one single-line item
   veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: markdown-mode - list - multiple single-line items
+Name: fill-paragraph-semlf - markdown-mode - list - multiple single-line items
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -39,7 +44,7 @@ Name: markdown-mode - list - multiple single-line items
 - Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: markdown-mode - list - one multi-line item
+Name: fill-paragraph-semlf - markdown-mode - list - one multi-line item
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -53,7 +58,7 @@ Name: markdown-mode - list - one multi-line item
   veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: markdown-mode - list - multiple multi-line items
+Name: fill-paragraph-semlf - markdown-mode - list - multiple multi-line items
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -77,7 +82,7 @@ Name: markdown-mode - list - multiple multi-line items
   officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: markdown-mode - list - short sentence in multi-line item
+Name: fill-paragraph-semlf - markdown-mode - list - short sentence in multi-line item
 
 =-=
 - Lorem ipsum dolor.  Sit amet, consectetur adipiscing elit, sed do
@@ -91,7 +96,7 @@ Name: markdown-mode - list - short sentence in multi-line item
   veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: markdown-mode - indented block
+Name: fill-paragraph-semlf - markdown-mode - indented block
 Skip: t
 
 TODO - In `markdown-mode', the `fill-forward-paragraph' function
diff --git a/test/lisp/textmodes/fill-resources/semlf-org-mode.erts b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-org-mode.erts
index 81dd4841de9..8a949483ff0 100644
--- a/test/lisp/textmodes/fill-resources/semlf-org-mode.erts
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf-org-mode.erts
@@ -1,6 +1,11 @@
 Point-Char: |
 
-Name: org-mode
+Code:
+  (lambda ()
+    (org-mode)
+    (fill-paragraph-semlf))
+
+Name: fill-paragraph-semlf - org-mode
 
 =-=
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -13,7 +18,7 @@ Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: org-mode - list - one single-line item
+Name: fill-paragraph-semlf - org-mode - list - one single-line item
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -24,7 +29,7 @@ Name: org-mode - list - one single-line item
   veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: org-mode - list - multiple single-line items
+Name: fill-paragraph-semlf - org-mode - list - multiple single-line items
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
@@ -39,7 +44,7 @@ Name: org-mode - list - multiple single-line items
 - Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: org-mode - list - one multi-line item
+Name: fill-paragraph-semlf - org-mode - list - one multi-line item
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -53,7 +58,7 @@ Name: org-mode - list - one multi-line item
   veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: org-mode - list - multiple multi-line items
+Name: fill-paragraph-semlf - org-mode - list - multiple multi-line items
 
 =-=
 - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
@@ -77,7 +82,7 @@ Name: org-mode - list - multiple multi-line items
   officia deserunt mollit anim id est laborum.
 =-=-=
 
-Name: org-mode - list - short sentence in multi-line item
+Name: fill-paragraph-semlf - org-mode - list - short sentence in multi-line item
 
 =-=
 - Lorem ipsum dolor.  Sit amet, consectetur adipiscing elit, sed do
@@ -91,7 +96,7 @@ Name: org-mode - list - short sentence in multi-line item
   veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
 
-Name: org-mode - indented block
+Name: fill-paragraph-semlf - org-mode - indented block
 
 =-=
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
diff --git a/test/lisp/textmodes/fill-resources/fill-paragraph-semlf.erts b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf.erts
new file mode 100644
index 00000000000..4a81f2120cc
--- /dev/null
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph-semlf.erts
@@ -0,0 +1,344 @@
+Point-Char: |
+
+Code:
+  (lambda ()
+    (fill-paragraph-semlf))
+
+Name: fill-paragraph-semlf - beginning of buffer
+
+=-=
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - second paragraph
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - end of buffer
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.|
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - punctuation marks
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua!  Ut enim
+ad minim veniam?  Quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua!
+Ut enim ad minim veniam?
+Quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - fill-prefix - marker
+
+=-=
+- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+- Aliquip ex ea commodo consequat.  Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+=-=
+- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+- eiusmod tempor.
+- Incididunt ut labore et dolore magna aliqua. Ut enim ad minim
+- veniam, quis nostrud exercitation ullamco laboris nisi ut.
+- Aliquip ex ea commodo consequat.
+- Duis aute irure dolor in reprehenderit in voluptate velit esse
+- cillum dolore eu fugiat nulla pariatur.
+- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
+- officia deserunt mollit anim id est laborum.
+=-=-=
+
+Name: fill-paragraph-semlf - fill-prefix - whitespace
+
+=-=
+- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+  Aliquip ex ea commodo consequat.  Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+  Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+=-=
+- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+  eiusmod tempor.
+  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim
+  veniam, quis nostrud exercitation ullamco laboris nisi ut.
+  Aliquip ex ea commodo consequat.
+  Duis aute irure dolor in reprehenderit in voluptate velit esse
+  cillum dolore eu fugiat nulla pariatur.
+  Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
+  officia deserunt mollit anim id est laborum.
+=-=-=
+
+Name: fill-paragraph-semlf - indented block
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+        |Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
+        do eiusmod tempor.  Incididunt ut labore et dolore magna
+        aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+        ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
+        do eiusmod tempor.
+        Incididunt ut labore et dolore magna aliqua. Ut enim ad minim
+        veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - sentence-end-without-space (Bug#79575)
+
+=-=
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお。
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお。
+=-=
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお
+あいうえおあいうえお。
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお
+あいうえおあいうえお。
+=-=-=
+
+Name: fill-paragraph-semlf - do not merge lines
+
+=-=
+abc def.
+abc def.
+=-=
+abc def.
+abc def.
+=-=-=
+
+Name: fill-paragraph-semlf - do not merge lines with wide characters
+
+=-=
+あいうえお。
+あいうえお。
+=-=
+あいうえお。
+あいうえお。
+=-=-=
+
+Code:
+  (lambda ()
+    (setq-local sentence-end-double-space nil)
+    (fill-paragraph-semlf))
+
+Name: fill-paragraph-semlf - single space
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - single space - do not merge lines
+
+=-=
+abc def.
+abc def.
+=-=
+abc def.
+abc def.
+=-=-=
+
+Name: fill-paragraph-semlf - single space - do not merge lines with wide characters
+
+=-=
+あいうえお。
+あいうえお。
+=-=
+あいうえお。
+あいうえお。
+=-=-=
+
+Name: fill-paragraph-semlf - fill-separate-heterogeneous-words-with-space (Bug#79575)
+Code:
+  (lambda ()
+    (setq-local fill-separate-heterogeneous-words-with-space t)
+    (fill-paragraph-semlf))
+
+=-=
+abc def.
+あいうえお。
+=-=
+abc def.
+あいうえお。
+=-=-=
+
+Name: fill-paragraph-semlf - single space - fill-separate-heterogeneous-words-with-space
+Code:
+  (lambda ()
+    (setq-local fill-separate-heterogeneous-words-with-space t)
+    (setq-local sentence-end-double-space nil)
+    (fill-paragraph-semlf))
+
+=-=
+abc def.
+あいうえお。
+=-=
+abc def.
+あいうえお。
+=-=-=
+
+Name: fill-paragraph-semlf - justify
+Code:
+  (lambda ()
+    (fill-paragraph-semlf 'justify))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem  ipsum  dolor sit  amet,  consectetur  adipiscing elit,  sed  do
+eiusmod tempor.
+Incididunt ut labore et dolore magna  aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - fill-column
+Code:
+  (lambda ()
+    (setq-local fill-column 35)
+    (fill-paragraph-semlf))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet,
+consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore
+magna aliqua. Ut enim ad minim
+veniam, quis nostrud exercitation
+ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - twice
+Code:
+  (lambda ()
+    (goto-char (point-min))
+    (fill-paragraph-semlf)
+    (goto-char (point-min))
+    (fill-paragraph-semlf))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Name: fill-paragraph-semlf - revert
+Code:
+  (lambda ()
+    (fill-paragraph)
+    (fill-paragraph-semlf)
+    (fill-paragraph))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
diff --git a/test/lisp/textmodes/fill-resources/fill-paragraph.erts b/test/lisp/textmodes/fill-resources/fill-paragraph.erts
new file mode 100644
index 00000000000..94a23543e90
--- /dev/null
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph.erts
@@ -0,0 +1,128 @@
+Point-Char: |
+
+Name: fill-paragraph
+Code:
+  (lambda ()
+    (setq-local fill-column 35)
+    (fill-paragraph))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet,
+consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut
+labore et dolore magna aliqua. Ut
+enim ad minim veniam, quis nostrud
+exercitation ullamco laboris nisi
+ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Code:
+  (lambda ()
+    (setq-local sentence-end-double-space t)
+    (fill-paragraph))
+
+Name: fill-paragraph - merge lines
+
+=-=
+abc def.
+abc def.
+=-=
+abc def.  abc def.
+=-=-=
+
+Name: fill-paragraph - merge lines with wide characters
+
+=-=
+あいうえお。
+あいうえお。
+=-=
+あいうえお。あいうえお。
+=-=-=
+
+Code:
+  (lambda ()
+    (setq-local sentence-end-double-space nil)
+    (fill-paragraph))
+
+Name: fill-paragraph - single space - merge lines
+
+=-=
+abc def.
+abc def.
+=-=
+abc def. abc def.
+=-=-=
+
+Name: fill-paragraph - single space - merge lines with wide characters
+
+=-=
+あいうえお。
+あいうえお。
+=-=
+あいうえお。あいうえお。
+=-=-=
+
+Name: fill-paragraph - fill-separate-heterogeneous-words-with-space (Bug#79575)
+Code:
+  (lambda ()
+    (setq-local fill-separate-heterogeneous-words-with-space t)
+    (fill-paragraph))
+
+=-=
+abc def.
+あいうえお。
+=-=
+abc def.  あいうえお。
+=-=-=
+
+Name: fill-paragraph - single space - fill-separate-heterogeneous-words-with-space
+Code:
+  (lambda ()
+    (setq-local fill-separate-heterogeneous-words-with-space t)
+    (setq-local sentence-end-double-space nil)
+    (fill-paragraph))
+
+=-=
+abc def.
+あいうえお。
+=-=
+abc def. あいうえお。
+=-=-=
+
+Name: fill-paragraph - fill-region-as-paragraph-function
+Code:
+  (lambda ()
+    (setq-local fill-region-as-paragraph-function
+                #'fill-region-as-paragraph-semlf)
+    (fill-paragraph))
+
+=-=
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
diff --git a/test/lisp/textmodes/fill-resources/fill-region-as-paragraph-default.erts b/test/lisp/textmodes/fill-resources/fill-region-as-paragraph-default.erts
new file mode 100644
index 00000000000..70ab3c4e0d8
--- /dev/null
+++ b/test/lisp/textmodes/fill-resources/fill-region-as-paragraph-default.erts
@@ -0,0 +1,117 @@
+Point-Char: |
+
+Name: fill-region-as-paragraph-default
+Code:
+  (lambda ()
+    (setq-local fill-column 35)
+    (fill-region-as-paragraph-default
+     (point)
+     (progn
+       (goto-char (point-max))
+       (forward-line -1)
+       (beginning-of-line)
+       (point))))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, s|ed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
+do eiusmod tempor.  Incididunt ut
+labore et dolore magna aliqua. Ut
+enim ad minim veniam, quis nostrud
+exercitation ullamco laboris nisi
+ut.  Lorem ipsum dolor sit amet,
+consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut
+labore et dolore magna aliqua. Ut
+enim ad minim veniam, quis nostrud
+exercitation ullamco laboris nisi
+ut.  Lorem ipsum dolor sit amet,
+consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut
+labore et dolore magna aliqua. Ut
+enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+=-=-=
+
+Code:
+  (lambda ()
+    (fill-region-as-paragraph-default (point-min) (point-max)))
+
+Name: fill-region-as-paragraph-default - merge lines
+
+=-=
+abc def.
+abc def.
+=-=
+abc def.  abc def.
+=-=-=
+
+Name: fill-region-as-paragraph-default - merge lines with wide characters
+
+=-=
+あいうえお。
+あいうえお。
+=-=
+あいうえお。あいうえお。
+=-=-=
+
+Code:
+  (lambda ()
+    (setq-local sentence-end-double-space nil)
+    (fill-region-as-paragraph-default (point-min) (point-max)))
+
+Name: fill-region-as-paragraph-default - single space - merge lines
+
+=-=
+abc def.
+abc def.
+=-=
+abc def. abc def.
+=-=-=
+
+Name: fill-region-as-paragraph-default - single space - merge lines with wide characters
+
+=-=
+あいうえお。
+あいうえお。
+=-=
+あいうえお。あいうえお。
+=-=-=
+
+Name: fill-region-as-paragraph-default - fill-separate-heterogeneous-words-with-space (Bug#79575)
+Code:
+  (lambda ()
+    (setq-local fill-separate-heterogeneous-words-with-space t)
+    (fill-region-as-paragraph-default (point-min) (point-max)))
+
+=-=
+abc def.
+あいうえお。
+=-=
+abc def.  あいうえお。
+=-=-=
+
+Name: fill-region-as-paragraph-default - single space - fill-separate-heterogeneous-words-with-space
+Code:
+  (lambda ()
+    (setq-local fill-separate-heterogeneous-words-with-space t)
+    (setq-local sentence-end-double-space nil)
+    (fill-region-as-paragraph-default (point-min) (point-max)))
+
+=-=
+abc def.
+あいうえお。
+=-=
+abc def. あいうえお。
+=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-fill-region-as-paragraph.erts b/test/lisp/textmodes/fill-resources/fill-region-as-paragraph-semlf.erts
index 114eaa46fc3..b002778008f 100644
--- a/test/lisp/textmodes/fill-resources/semlf-fill-region-as-paragraph.erts
+++ b/test/lisp/textmodes/fill-resources/fill-region-as-paragraph-semlf.erts
@@ -1,6 +1,16 @@
 Point-Char: |
 
 Name: fill-region-as-paragraph-semlf
+Code:
+  (lambda ()
+    (setq-local fill-column 35)
+    (fill-region-as-paragraph-semlf
+     (point)
+     (progn
+       (goto-char (point-max))
+       (forward-line -1)
+       (beginning-of-line)
+       (point))))
 
 =-=
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, s|ed do
@@ -35,3 +45,20 @@ Incididunt ut labore et dolore
 magna aliqua. Ut enim
 ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
 =-=-=
+
+Name: fill-region-as-paragraph-semlf - sentence-end-without-space (Bug#79575)
+Code:
+  (lambda ()
+    (fill-region-as-paragraph-semlf
+     (point-min)
+     (point-max)))
+
+=-=
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお。
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお。
+=-=
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお
+あいうえおあいうえお。
+あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお
+あいうえおあいうえお。
+=-=-=
diff --git a/test/lisp/textmodes/fill-resources/fill-region-as-paragraph.erts b/test/lisp/textmodes/fill-resources/fill-region-as-paragraph.erts
new file mode 100644
index 00000000000..b69afb8333b
--- /dev/null
+++ b/test/lisp/textmodes/fill-resources/fill-region-as-paragraph.erts
@@ -0,0 +1,63 @@
+Point-Char: |
+
+Name: fill-region-as-paragraph
+Code:
+  (lambda ()
+    (fill-region-as-paragraph
+     (point)
+     (progn
+       (goto-char (point-max))
+       (forward-line -1)
+       (beginning-of-line)
+       (point))))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.  Lorem
+ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+tempor.  Incididunt ut labore et dolore magna aliqua.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+=-=-=
+
+Name: fill-region-as-paragraph - fill-region-as-paragraph-function
+Code:
+  (lambda ()
+    (setq-local fill-region-as-paragraph-function
+                #'fill-region-as-paragraph-semlf)
+    (fill-region-as-paragraph
+     (point)
+     (progn
+       (goto-char (point-max))
+       (forward-line -1)
+       (beginning-of-line)
+       (point))))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+=-=-=
diff --git a/test/lisp/textmodes/fill-resources/fill-region.erts b/test/lisp/textmodes/fill-resources/fill-region.erts
index 95e08248309..84ad57eba2c 100644
--- a/test/lisp/textmodes/fill-resources/fill-region.erts
+++ b/test/lisp/textmodes/fill-resources/fill-region.erts
@@ -1,6 +1,15 @@
 Point-Char: |
 
-Name: fill region
+Name: fill-region
+Code:
+  (lambda ()
+    (fill-region
+     (point)
+     (progn
+       (goto-char (point-max))
+       (forward-line -1)
+       (beginning-of-line)
+       (point))))
 
 =-=
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
@@ -21,3 +30,38 @@ eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
 =-=-=
+
+Name: fill-region - fill-region-as-paragraph-function
+Code:
+  (lambda ()
+    (setq-local fill-region-as-paragraph-function
+                #'fill-region-as-paragraph-semlf)
+    (fill-region
+     (point)
+     (progn
+       (goto-char (point-max))
+       (forward-line -1)
+       (beginning-of-line)
+       (point))))
+
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+=-=
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+eiusmod tempor.
+Incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
+=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-fill-column.erts b/test/lisp/textmodes/fill-resources/semlf-fill-column.erts
deleted file mode 100644
index 20db7b1f9c5..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-fill-column.erts
+++ /dev/null
@@ -1,15 +0,0 @@
-Name: fill-column
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet,
-consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore
-magna aliqua. Ut enim ad minim
-veniam, quis nostrud exercitation
-ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-fill-prefix.erts b/test/lisp/textmodes/fill-resources/semlf-fill-prefix.erts
deleted file mode 100644
index e067eff6970..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-fill-prefix.erts
+++ /dev/null
@@ -1,35 +0,0 @@
-Name: fill-prefix - marker
-
-=-=
-- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-- Aliquip ex ea commodo consequat.  Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-=-=
-- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-- eiusmod tempor.
-- Incididunt ut labore et dolore magna aliqua. Ut enim ad minim
-- veniam, quis nostrud exercitation ullamco laboris nisi ut.
-- Aliquip ex ea commodo consequat.
-- Duis aute irure dolor in reprehenderit in voluptate velit esse
-- cillum dolore eu fugiat nulla pariatur.
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
-- officia deserunt mollit anim id est laborum.
-=-=-=
-
-Name: fill-prefix - whitespace
-
-=-=
-- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-  Aliquip ex ea commodo consequat.  Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-  Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-=-=
-- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-  eiusmod tempor.
-  Incididunt ut labore et dolore magna aliqua. Ut enim ad minim
-  veniam, quis nostrud exercitation ullamco laboris nisi ut.
-  Aliquip ex ea commodo consequat.
-  Duis aute irure dolor in reprehenderit in voluptate velit esse
-  cillum dolore eu fugiat nulla pariatur.
-  Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
-  officia deserunt mollit anim id est laborum.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-fill-region.erts b/test/lisp/textmodes/fill-resources/semlf-fill-region.erts
deleted file mode 100644
index 231019a082a..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-fill-region.erts
+++ /dev/null
@@ -1,25 +0,0 @@
-Point-Char: |
-
-Name: fill-region-as-paragraph-function
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
-
-|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.  Incididunt ut labore et dolore magna aliqua.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-indented-block.erts b/test/lisp/textmodes/fill-resources/semlf-indented-block.erts
deleted file mode 100644
index e483567c6ab..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-indented-block.erts
+++ /dev/null
@@ -1,31 +0,0 @@
-Point-Char: |
-
-Name: indented block
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-        |Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
-        do eiusmod tempor.  Incididunt ut labore et dolore magna
-        aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-        ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
-        do eiusmod tempor.
-        Incididunt ut labore et dolore magna aliqua. Ut enim ad minim
-        veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-justify.erts b/test/lisp/textmodes/fill-resources/semlf-justify.erts
deleted file mode 100644
index 3a951b7ce42..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-justify.erts
+++ /dev/null
@@ -1,12 +0,0 @@
-Name: justify
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem  ipsum  dolor sit  amet,  consectetur  adipiscing elit,  sed  do
-eiusmod tempor.
-Incididunt ut labore et dolore magna  aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-punctuation-marks.erts b/test/lisp/textmodes/fill-resources/semlf-punctuation-marks.erts
deleted file mode 100644
index 5346216e9f9..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-punctuation-marks.erts
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: punctuation marks
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua!  Ut enim
-ad minim veniam?  Quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua!
-Ut enim ad minim veniam?
-Quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-revert.erts b/test/lisp/textmodes/fill-resources/semlf-revert.erts
deleted file mode 100644
index d3efca50de6..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-revert.erts
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: revert
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-sentence-end-double-space.erts b/test/lisp/textmodes/fill-resources/semlf-sentence-end-double-space.erts
deleted file mode 100644
index a01beed0f66..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-sentence-end-double-space.erts
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: sentence-end-double-space
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua.
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
-nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf-twice.erts b/test/lisp/textmodes/fill-resources/semlf-twice.erts
deleted file mode 100644
index 862dda6e27e..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf-twice.erts
+++ /dev/null
@@ -1,12 +0,0 @@
-Name: fill twice
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-resources/semlf.erts b/test/lisp/textmodes/fill-resources/semlf.erts
deleted file mode 100644
index f3e331cd938..00000000000
--- a/test/lisp/textmodes/fill-resources/semlf.erts
+++ /dev/null
@@ -1,88 +0,0 @@
-Point-Char: |
-
-Name: beginning of buffer
-
-=-=
-|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
-
-Name: second paragraph
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-|Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
-
-Name: end of buffer
-
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.|
-=-=
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.  Incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-eiusmod tempor.
-Incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut.
-=-=-=
diff --git a/test/lisp/textmodes/fill-tests.el b/test/lisp/textmodes/fill-tests.el
index e1839fd6884..c88a8b8c5b5 100644
--- a/test/lisp/textmodes/fill-tests.el
+++ b/test/lisp/textmodes/fill-tests.el
@@ -79,7 +79,7 @@
                (buffer-string)
                "aaa =   baaaaaaaa aaaaaaaaaa\n         aaaaaaaaaa\n")))))
 
-(ert-deftest test-fill-end-period ()
+(ert-deftest fill-test-end-period ()
   (should
    (equal
     (with-temp-buffer
@@ -101,7 +101,7 @@
     "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
 eius. Foo")))
 
-(ert-deftest test-fill-haskell ()
+(ert-deftest fill-test-haskell ()
   (should
    (equal
     (with-temp-buffer
@@ -122,135 +122,46 @@ eius. Foo")))
   ;; w
 ")))
 
-(ert-deftest fill-test-fill-region ()
-  "Test the `fill-region' function."
-  (ert-test-erts-file (ert-resource-file "fill-region.erts")
-                      (lambda ()
-                        (fill-region
-                         (point)
-                         (progn
-                           (goto-char (point-max))
-                           (forward-line -1)
-                           (beginning-of-line)
-                           (point))))))
+(ert-deftest fill-test-fill-region-as-paragraph-default ()
+  "Test the `fill-region-as-paragraph-default' function."
+  (ert-test-erts-file (ert-resource-file "fill-region-as-paragraph-default.erts")))
 
 (ert-deftest fill-test-fill-region-as-paragraph-semlf ()
   "Test the `fill-region-as-paragraph-semlf' function."
-  (ert-test-erts-file (ert-resource-file "semlf-fill-region-as-paragraph.erts")
-                      (lambda ()
-                        (setq-local fill-column 35)
-                        (fill-region-as-paragraph-semlf
-                         (point)
-                         (progn
-                           (goto-char (point-max))
-                           (forward-line -1)
-                           (beginning-of-line)
-                           (point))))))
-
-(ert-deftest fill-test-semlf-fill-region ()
-  "Test `fill-region' with `fill-region-as-paragraph-semlf'."
-  (ert-test-erts-file (ert-resource-file "semlf-fill-region.erts")
-                      (lambda ()
-                        (setq-local fill-region-as-paragraph-function
-                                    #'fill-region-as-paragraph-semlf)
-                        (fill-region
-                         (point)
-                         (progn
-                           (goto-char (point-max))
-                           (forward-line -1)
-                           (beginning-of-line)
-                           (point))))))
-
-(ert-deftest fill-test-semlf ()
-  "Test semantic-linefeed filling."
-  (ert-test-erts-file (ert-resource-file "semlf.erts")
-                      (lambda ()
-                        (fill-paragraph-semlf))))
-
-(ert-deftest fill-test-semlf-justify ()
-  "Test semantic-linefeed filling with text justification."
-  (ert-test-erts-file (ert-resource-file "semlf-justify.erts")
-                      (lambda ()
-                        (fill-paragraph-semlf 'justify))))
+  (ert-test-erts-file (ert-resource-file "fill-region-as-paragraph-semlf.erts")))
 
-(ert-deftest fill-test-semlf-sentence-end-double-space ()
-  "Test semantic-linefeed filling with `sentence-end-double-space'."
-  (ert-test-erts-file (ert-resource-file "semlf-sentence-end-double-space.erts")
-                      (lambda ()
-                        (setq-local sentence-end-double-space nil)
-                        (fill-paragraph-semlf))))
+(ert-deftest fill-test-fill-region-as-paragraph ()
+  "Test the `fill-region-as-paragraph' function."
+  (ert-test-erts-file (ert-resource-file "fill-region-as-paragraph.erts")))
 
-(ert-deftest fill-test-semlf-fill-column ()
-  "Test semantic-linefeed filling with `fill-column'."
-  (ert-test-erts-file (ert-resource-file "semlf-fill-column.erts")
-                      (lambda ()
-                        (setq-local fill-column 35)
-                        (fill-paragraph-semlf))))
-
-(ert-deftest fill-test-semlf-punctuation-marks ()
-  "Test semantic-linefeed filling with different punctuation marks."
-  (ert-test-erts-file (ert-resource-file "semlf-punctuation-marks.erts")
-                      (lambda ()
-                        (fill-paragraph-semlf))))
-
-(ert-deftest fill-test-semlf-twice ()
-  "Test filling the same text twice using semantic linefeeds."
-  (ert-test-erts-file (ert-resource-file "semlf-twice.erts")
-                      (lambda ()
-                        (goto-char (point-min))
-                        (fill-paragraph-semlf)
-                        (goto-char (point-min))
-                        (fill-paragraph-semlf))))
-
-(ert-deftest fill-test-semlf-fill-prefix ()
-  "Test semantic-linefeed filling with different fill prefixes."
-  (ert-test-erts-file (ert-resource-file "semlf-fill-prefix.erts")
-                      (lambda ()
-                        (fill-paragraph-semlf))))
+(ert-deftest fill-test-fill-region ()
+  "Test the `fill-region' function."
+  (ert-test-erts-file (ert-resource-file "fill-region.erts")))
 
-(ert-deftest fill-test-semlf-indented-block ()
-  "Test semantic-linefeed filling with an indented block."
-  (ert-test-erts-file (ert-resource-file "semlf-indented-block.erts")
-                      (lambda ()
-                        (fill-paragraph-semlf))))
+(ert-deftest fill-test-fill-paragraph ()
+  "Test the `fill-paragraph' function."
+  (ert-test-erts-file (ert-resource-file "fill-paragraph.erts")))
 
-(ert-deftest fill-test-semlf-revert ()
-  "Test that semantic-linefeed filling can be reverted."
-  (ert-test-erts-file (ert-resource-file "semlf-revert.erts")
-                      (lambda ()
-                        (fill-paragraph)
-                        (fill-paragraph-semlf)
-                        (fill-paragraph))))
+(ert-deftest fill-test-fill-paragraph-semlf ()
+  "Test the `fill-paragraph-semlf' function."
+  (ert-test-erts-file (ert-resource-file "fill-paragraph-semlf.erts")))
 
-(ert-deftest fill-test-semlf-emacs-lisp-mode ()
-  "Test semantic-linefeed filling with `emacs-lisp-mode'."
-  (ert-test-erts-file (ert-resource-file "semlf-emacs-lisp-mode.erts")
-                      (lambda ()
-                        (emacs-lisp-mode)
-                        (fill-paragraph-semlf))))
+(ert-deftest fill-test-fill-paragraph-semlf-emacs-lisp-mode ()
+  "Test the `fill-paragraph-semlf' function in `emacs-lisp-mode'."
+  (ert-test-erts-file (ert-resource-file "fill-paragraph-semlf-emacs-lisp-mode.erts")))
 
-(ert-deftest fill-test-semlf-c-mode ()
-  "Test semantic-linefeed filling with `c-mode'."
-  (ert-test-erts-file (ert-resource-file "semlf-c-mode.erts")
-                      (lambda ()
-                        (c-mode)
-                        (fill-paragraph-semlf))))
+(ert-deftest fill-test-fill-paragraph-semlf-c-mode ()
+  "Test the `fill-paragraph-semlf' function in `c-mode'."
+  (ert-test-erts-file (ert-resource-file "fill-paragraph-semlf-c-mode.erts")))
 
-(ert-deftest fill-test-semlf-org-mode ()
-  "Test semantic-linefeed filling with `org-mode'."
-  (ert-test-erts-file (ert-resource-file "semlf-org-mode.erts")
-                      (lambda ()
-                        (org-mode)
-                        (fill-paragraph-semlf))))
+(ert-deftest fill-test-fill-paragraph-semlf-org-mode ()
+  "Test the `fill-paragraph-semlf' function in `org-mode'."
+  (ert-test-erts-file (ert-resource-file "fill-paragraph-semlf-org-mode.erts")))
 
-(declare-function markdown-mode "markdown-mode")
-(ert-deftest fill-test-semlf-markdown-mode ()
-  "Test semantic-linefeed filling with `markdown-mode'."
+(ert-deftest fill-test-fill-paragraph-semlf-markdown-mode ()
+  "Test the `fill-paragraph-semlf' function in `markdown-mode'."
   (skip-unless (functionp 'markdown-mode))
-  (ert-test-erts-file (ert-resource-file "semlf-markdown-mode.erts")
-                      (lambda ()
-                        (markdown-mode)
-                        (fill-paragraph-semlf))))
+  (ert-test-erts-file (ert-resource-file "fill-paragraph-semlf-markdown-mode.erts")))
 
 (provide 'fill-tests)