Cleaned up Drone tests