Update Pirate & Tests