Some cleanup and adding unit tests for type enums
Moved character name from fluff into character object itself, to simplify a number of things.