Added Mana Tests, fixed exposed bugs