Modify user model and test