Refactor tests and User subclass-related functionality.