Fixed bug in deleting vm's
Merge branch 'test' into dev