Clean up user model and add tests