diff --git a/vtest/gen b/vtest/gen
index a901fc8a801a8..fdf513fedaa88 100755
--- a/vtest/gen
+++ b/vtest/gen
@@ -26,7 +26,8 @@ echo "VTEST_DIR: $VTEST_DIR"
 if test -n "$1"; then
       SRC=$1
 else
-      SRC="mmrest-1 bravura-mmrest gonville-mmrest mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\
+      SRC="bravura-mmrest gonville-mmrest\
+       ummrest-1 mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\
        mmrest-10 mmrest-11 mmrest-12 mmrest-13 mmrest-14 mmrest-15 mmrest-16 mmrest-17 mmrest-18\
        mmrest-19 mmrest-20 mmrest-21 mmrest-22 mmrest-23\
        fermata-1 fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 fmrest-6 measure-repeat-1\
@@ -59,8 +60,7 @@ else
        accidental-16 accidental-17 accidental-18 accidental-19 accidental-20\
        accidental-21 accidental-22 accidental-23\
        accidental-mirror\
-       tie-1 tie-2 tie-3 \
-       grace-1 grace-2 grace-3 grace-4 grace-5 \
+       tie-1 tie-2 tie-3 grace-1 grace-2 grace-3 grace-4 grace-5 \
        tuplets-1 tuplets-2 tuplets-3 tuplets-4 breath-1\
        harmony-1 harmony-2 harmony-3 harmony-4 harmony-5 harmony-6 harmony-7\
        harmony-8 harmony-9 harmony-10 harmony-11 harmony-12 harmony-13 harmony-14 harmony-15\
diff --git a/vtest/gen.bat b/vtest/gen.bat
index e986f4d1139f5..833e828d6b3bf 100644
--- a/vtest/gen.bat
+++ b/vtest/gen.bat
@@ -4,27 +4,28 @@ rem "magick compare" - image magick compare program
 
 set SRC=bravura-mmrest,gonville-mmrest, ^
  mmrest-1,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmrest-8,mmrest-9, ^
- mmrest-10,mmrest-11,mmrest-12,, mmrest-13, mmrest-14, mmrest-15, mmrest-16, mmrest-17, mmrest-18, ^
- mmrest-19, mmrest-20, mmrest-21, mmrest-22, mmrest-23, ^
- fermata-1 fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1, ^
+ mmrest-10,mmrest-11,mmrest-12,mmrest-13,mmrest-14,mmrest-15,mmrest-16,mmrest-17,mmrest-18, ^
+ mmrest-19,mmrest-20,mmrest-21,mmrest-22,mmrest-23, ^
+ fermata-1,fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1, ^
  noteheadposition-1,valign-1,valign-2,valign-3, ^
- emmentaler-1,bravura-1,gonville-1, musejazz-1, ^
- emmentaler-2,bravura-2,gonville-2, musejazz-2, ^
- emmentaler-3,bravura-3,gonville-3, musejazz-3, ^
- emmentaler-4,bravura-4,gonville-4, musejazz-4, ^
- emmentaler-5,bravura-5,gonville-5, musejazz-5, ^
- emmentaler-6,bravura-6,gonville-6, musejazz-6, ^
- emmentaler-7,bravura-7,gonville-7, musejazz-7, ^
- emmentaler-8,bravura-8,gonville-8, musejazz-8, ^
- emmentaler-9,bravura-9,gonville-9, musejazz-9, ^
- emmentaler-10,bravura-10,gonville-10, musejazz-10, ^
- emmentaler-11,bravura-11,gonville-11, musejazz-11, ^
+ emmentaler-1,bravura-1,gonville-1,musejazz-1, ^
+ emmentaler-2,bravura-2,gonville-2,musejazz-2, ^
+ emmentaler-3,bravura-3,gonville-3,musejazz-3, ^
+ emmentaler-4,bravura-4,gonville-4,musejazz-4, ^
+ emmentaler-5,bravura-5,gonville-5,musejazz-5, ^
+ emmentaler-6,bravura-6,gonville-6,musejazz-6, ^
+ emmentaler-7,bravura-7,gonville-7,musejazz-7, ^
+ emmentaler-8,bravura-8,gonville-8,musejazz-8, ^
+ emmentaler-9,bravura-9,gonville-9,musejazz-9, ^
+ emmentaler-10,bravura-10,gonville-10,musejazz-10, ^
+ emmentaler-11,bravura-11,gonville-11,musejazz-11, ^
  emmentaler-text-1,gonville-text-1,bravura-text-1,musejazz-text-1, ^
  emmentaler-text-2,gonville-text-2,bravura-text-2,musejazz-text-2, ^
  emmentaler-text-3,gonville-text-3,bravura-text-3,musejazz-text-3, ^
- flag, flag-straight, ledger-lines-2, ledger-lines-3, frame,frametext,ottava,bend-1, ^
+ flag,flag-straight,ledger-lines-2,ledger-lines-3,frame,frametext,ottava,bend-1, ^
  barline-1,barline-2,instrument-1,instrument-names-1,symbol-1, ^
- slurs-1,slurs-2,slurs-3,slurs-4,hairpins-1,pedal-1,line-1,line-2,line-3,line-4,line-5,line-6,line-7,line-colour,line-dashed,gliss-1,gliss-2,gliss-3, ^
+ slurs-1,slurs-2,slurs-3,slurs-4,slurs-5,slurs-6,slurs-7,slurs-8,slurs-9,slurs-10, ^
+ hairpins-1,pedal-1,line-1,line-2,line-3,line-4,line-5,line-6,line-7,line-colour,line-dashed,gliss-1,gliss-2,gliss-3, ^
  chord-layout-1,chord-layout-2,chord-layout-3,chord-layout-4,chord-layout-5, ^
  chord-layout-6,chord-layout-7,chord-layout-8,chord-layout-9,chord-layout-10, ^
  chord-layout-11,chord-layout-12,chord-layout-13,chord-layout-14,chord-layout-15,chord-layout-16,chord-layout-17, ^
@@ -35,7 +36,7 @@ set SRC=bravura-mmrest,gonville-mmrest, ^
  accidental-16,accidental-17,accidental-18,accidental-19,accidental-20, ^
  accidental-21,accidental-22,accidental-23, ^
  accidental-mirror, ^
- tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4, ^
+ tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4,grace-5 ^
  tuplets-1,tuplets-2,tuplets-3,tuplets-4,breath-1, ^
  harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7, ^
  harmony-8,harmony-9,harmony-10,harmony-11,harmony-12,harmony-13,harmony-14,harmony-15, ^
@@ -48,16 +49,16 @@ set SRC=bravura-mmrest,gonville-mmrest, ^
  system-1,system-2,system-3,system-4,system-5,system-6,system-7,system-8,system-9,system-10,system-11, ^
  hide-1,small-1,tremolo-1, ^
  staff-1,staff-2,staff-3,staff-4,staffEmptiness,layout-1,layout-2,layout-3,layout-4,layout-5,layout-6,layout-7,layout-8,layout-9,layout-10, ^
- articulation-1, percussion-grace, ^
- drumset-1, drumset-2, drumset-3, drumset-4, drumset-5, drumset-6, drumset-7, drumset-8, ^
- slashed_chord-layout-12, slashed_chord-layout-7, slashed_grace-3, slashed_noteheadposition-1, ^
- drumset-custom-1, read-206-custom-drumset-1, ^
- layout-sequence-1, layout-sequence-2, layout-sequence-3, layout-sequence-4, ^
- layout-sequence-5, layout-sequence-6, layout-sequence-7, layout-sequence-8, ^
- layout-sequence-9, layout-sequence-10, layout-sequence-11, layout-sequence-12, ^
- layout-sequence-13, layout-sequence-14, layout-sequence-15, layout-sequence-16, ^
- measure-number-1, measure-number-2, measure-number-3, measure-number-4, measure-number-5 ^
- custom-keysig-1, custom-keysig-2, custom-keysig-2, custom-keysig-3
+ articulation-1,percussion-grace, ^
+ drumset-1,drumset-2,drumset-3,drumset-4,drumset-5,drumset-6,drumset-7,drumset-8, ^
+ slashed_chord-layout-12,slashed_chord-layout-7,slashed_grace-3,slashed_noteheadposition-1, ^
+ drumset-custom-1,read-206-custom-drumset-1, ^
+ layout-sequence-1,layout-sequence-2,layout-sequence-3,layout-sequence-4, ^
+ layout-sequence-5,layout-sequence-6,layout-sequence-7,layout-sequence-8, ^
+ layout-sequence-9,layout-sequence-10,layout-sequence-11,layout-sequence-12, ^
+ layout-sequence-13, layout-sequence-14, layout-sequence-15,layout-sequence-16, ^
+ measure-number-1,measure-number-2,measure-number-3,measure-number-4,measure-number-5 ^
+ custom-keysig-1,custom-keysig-2,custom-keysig-2,custom-keysig-3,custom-keysig-4
 
 IF NOT "%1"=="" (
    SET INSTALL_PATH=%1