Armour values match old values now.
More optimization.
Cleaning up tests