Further progress on tests/refactor of Categorize and User