Finished mana parser

Resolved issues with mana parser and updated unit tests to handle all
situations known at this time.