Adding character parser unit tests and removing some parse code that was
redundant.