diff --git a/tests/gabc-dump/eol.dump b/tests/gabc-dump/eol.dump
index 43b1dc53..d77bf84e 100644
--- a/tests/gabc-dump/eol.dump
+++ b/tests/gabc-dump/eol.dump
@@ -944,10 +944,14 @@
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
+---------------------------------------------------------------------
+     character                 t
+---------------------------------------------------------------------
+     character                 h
 ---------------------------------------------------------------------
      beginning of style          ST_CENTER
 ---------------------------------------------------------------------
-     character                 a
+     character                 e
 ---------------------------------------------------------------------
      end of style                ST_CENTER
 ---------------------------------------------------------------------
@@ -964,6 +968,28 @@
    position                  4 (WORD_ONE_SYLLABLE)
 ---------------------------------------------------------------------
      beginning of style          ST_CENTER
+---------------------------------------------------------------------
+     character                 e
+---------------------------------------------------------------------
+     end of style                ST_CENTER
+---------------------------------------------------------------------
+     character                 n
+---------------------------------------------------------------------
+     character                 d
+---------------------------------------------------------------------
+     type                    3 (GRE_ELEMENT)
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+       type                  2 (GRE_GLYPH)
+       glyph_type            16 (G_PUNCTUM)
+-  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
+         type                   1 (GRE_NOTE)
+         pitch                  f
+         shape                  1 (S_PUNCTUM)
+=====================================================================
+   type                      5 (GRE_SYLLABLE)
+   position                  4 (WORD_ONE_SYLLABLE)
+---------------------------------------------------------------------
+     beginning of style          ST_CENTER
 ---------------------------------------------------------------------
      character                 o
 ---------------------------------------------------------------------
@@ -977,7 +1003,29 @@
        glyph_type            16 (G_PUNCTUM)
 -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
          type                   1 (GRE_NOTE)
-         pitch                  f
+         pitch                  h
+         shape                  1 (S_PUNCTUM)
+=====================================================================
+   type                      5 (GRE_SYLLABLE)
+   position                  4 (WORD_ONE_SYLLABLE)
+---------------------------------------------------------------------
+     character                 t
+---------------------------------------------------------------------
+     character                 h
+---------------------------------------------------------------------
+     beginning of style          ST_CENTER
+---------------------------------------------------------------------
+     character                 e
+---------------------------------------------------------------------
+     end of style                ST_CENTER
+---------------------------------------------------------------------
+     type                    3 (GRE_ELEMENT)
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+       type                  2 (GRE_GLYPH)
+       glyph_type            16 (G_PUNCTUM)
+-  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
+         type                   1 (GRE_NOTE)
+         pitch                  j
          shape                  1 (S_PUNCTUM)
 =====================================================================
    type                      5 (GRE_SYLLABLE)
diff --git a/tests/gabc-dump/eol.gabc b/tests/gabc-dump/eol.gabc
index ff476d68..08f11d83 100644
--- a/tests/gabc-dump/eol.gabc
+++ b/tests/gabc-dump/eol.gabc
@@ -6,4 +6,4 @@ This(e) is(d) a(h) test(f) of(h) z-(g) (::z-)
 This(e) is(d) a(h) test(f) of(h) Z(g) (::Z)
 This(e) is(d) a(h) test(f) of(h) Z<v>+</v>(g) (::Z+)
 This(e) is(d) a(h) test(f) of(h) Z-(g) (::Z-)
-This(e) is(d) a(h) of(f) test(g) (::)
+This(e) is(d) the(h) end(f) of(h) the(j) test(g) (::)
diff --git a/tests/gabc-gabc/eol.exp b/tests/gabc-gabc/eol.exp
index c970bb3f..3b279d54 100644
--- a/tests/gabc-gabc/eol.exp
+++ b/tests/gabc-gabc/eol.exp
@@ -1,4 +1,4 @@
 name: eol;
-generated-by: gregorio 4.0.1-fix-800-97edb51-2966;
+generated-by: gregorio 4.0.1-fix-800-ec84e43-2975;
 %%
-(c4)This(e) is(d) a(h) test(f) of (h) z(g) (::z) This(e) is(d) a(h) test(f) of(h) z<v>+</v>(g) (::z+) This(e) is(d) a(h) test(f) of(h) z<v>\GreForceHyphen</v>(g) (::z-) This(e) is(d) a(h) test(f) of(h) Z(g) (::Z) This(e) is(d) a(h) test(f) of(h) Z<v>+</v>(g) (::Z+) This(e) is(d) a(h) test(f) of(h) Z<v>\GreForceHyphen</v>(g) (::Z-) This(e) is(d) a(h) of(f) test(g) (::) 
+(c4)This(e) is(d) a(h) test(f) of (h) z(g) (::z) This(e) is(d) a(h) test(f) of(h) z<v>+</v>(g) (::z+) This(e) is(d) a(h) test(f) of(h) z<v>\GreForceHyphen</v>(g) (::z-) This(e) is(d) a(h) test(f) of(h) Z(g) (::Z) This(e) is(d) a(h) test(f) of(h) Z<v>+</v>(g) (::Z+) This(e) is(d) a(h) test(f) of(h) Z<v>\GreForceHyphen</v>(g) (::Z-) This(e) is(d) the(h) end(f) of(h) the(j) test(g) (::) 
diff --git a/tests/gabc-gtex/bugs/fix-42-a.tex b/tests/gabc-gtex/bugs/fix-42-a.tex
index cc9b8f70..ff671823 100644
--- a/tests/gabc-gtex/bugs/fix-42-a.tex
+++ b/tests/gabc-gtex/bugs/fix-42-a.tex
@@ -1,12 +1,12 @@
-% File generated by gregorio 4.0.1-fix-756-7fb5812-2890
+% File generated by gregorio 4.0.1-fix-800-ad76337-2976
 \GregorioTeXAPIVersion{4.0.1}%
 \GreBeginHeaders %
 \GreEndHeaders %
-\GreBeginScore{cf8950f122d803854d1a40485f0c1868a05f3af5}{6}{5}{0}{0}{}{4}%
+\GreBeginScore{856cb22bf55824979ab51348fc3ec9286c523cdc}{6}{5}{0}{0}{}{4}%
 \GreScoreOpening{%
 }{%
 \GreSetInitialClef{c}{4}{3}{c}{0}{3}%
-}{\GreSyllable}{\GreSetFirstSyllableText{A}{}{}{{}{\GreFirstWord{}}{}}{{}{\GreFirstWord{\GreFirstSyllable{\GreFirstSyllableInitial{A}}}}{}}{\GreForceHyphen}}{}{\GreFirstWord}{0}{\GreSetNextSyllable{\GreFirstWord{m}}{\GreFirstWord{e}}{\GreFirstWord{n}}{\GreFirstWord{m}}{\GreFirstWord{e}\GreFirstWord{n}}}{}{0}{}{%
+}{\GreSyllable}{\GreSetFirstSyllableText{A}{}{}{{}{\GreFirstWord{}}{}}{{}{\GreFirstWord{\GreFirstSyllable{\GreFirstSyllableInitial{A}}}}{}}{\GreEmptyFirstSyllableHyphen}}{}{\GreFirstWord}{0}{\GreSetNextSyllable{\GreFirstWord{m}}{\GreFirstWord{e}}{\GreFirstWord{n}}{\GreFirstWord{m}}{\GreFirstWord{e}\GreFirstWord{n}}}{}{0}{}{%
 \GreGlyph{\GreCPPunctum}{5}{5}{0}%
 {%
 \GreGlyphHeights{5}{5}%
diff --git a/tests/gabc-output/bugs/fix-804.gabc b/tests/gabc-output/bugs/fix-804.gabc
new file mode 100644
index 00000000..2a4cb28b
--- /dev/null
+++ b/tests/gabc-output/bugs/fix-804.gabc
@@ -0,0 +1,3 @@
+name:fix-804;
+%%
+(c3) Hy-(g)phen-(h)a-(i) (::Z) tion.(j)
diff --git a/tests/gabc-output/bugs/fix-804.pdf b/tests/gabc-output/bugs/fix-804.pdf
new file mode 100644
index 00000000..5c7d1571
Binary files /dev/null and b/tests/gabc-output/bugs/fix-804.pdf differ
diff --git a/tests/gabc-output/eol-reverse.pdf b/tests/gabc-output/eol-reverse.pdf
index 81fd1646..53ddb9ce 100644
Binary files a/tests/gabc-output/eol-reverse.pdf and b/tests/gabc-output/eol-reverse.pdf differ
diff --git a/tests/gabc-output/eol.pdf b/tests/gabc-output/eol.pdf
index efd075b0..62b35d3f 100644
Binary files a/tests/gabc-output/eol.pdf and b/tests/gabc-output/eol.pdf differ
diff --git a/tests/gabc-output/slurs.pdf b/tests/gabc-output/slurs.pdf
index f7512acd..fbf92d9b 100644
Binary files a/tests/gabc-output/slurs.pdf and b/tests/gabc-output/slurs.pdf differ