Added Drone, and some more tests