Reorganized some of the character responsibilities; Updated tests.