Updated tests and models, now uses character_class instead of class as column name