fixes for some vm tests
Merge pull request #1452 from dajohnso/fix_vms

fixes for some vm tests