add tests for user model
Merge branch 'testing'