more vtest fixes

resp. fixing the earlier fix...
Merge pull request #854 from Jojo-Schmitz/vtest-fixes

more vtest fixes