Changed tests and attack.

Added phase/stage setters to fortify/reinforce tests and changed attack
parameters back to just the two territories.