Added user model and tests