Fix vm discovery and power_control tests