update & add vtests