More work on refactored User and Categorizer classes; 29 tests now passing.