fix vtest gen
fix #25945
fix mtest
Merge pull request #956 from MarcSabatella/vtest-gen

fix vtest gen