Tests added
User model added
Merge branch 'model_user'