more vtest fixes