CLOUDSTACK-5674: Fixed all BVTs and some marvin functions