Develop: vm, volume and fw test improvements