vm test fixes
Further small fixes