Fixed bug in storing VM's.
Merge branch 'test' into dev