Drone testing fixes