Small fixes to vm tests to add versatility