made empty specs for models
Added basic user model tests
fixed user merge conflict