Pirate - Upgrade captain strategy + new tests