Add tests and update User model.