Improved deleting of failed vm's.
Merge branch 'test' into dev