Update to the mana system & associated tests.