Marked generic tests with BZ
Merge pull request #1451 from sshveta/genericmarkbz

Marked generic tests with BZ
fixes for some vm tests
Merge pull request #1452 from dajohnso/fix_vms

fixes for some vm tests