Moved more var/mutators to Unit from Foe and Player. Fixed tests to
reflect new foe style.