Add unit tests for user model
Merge pull request #8 from qsymmachus/users

Add unit tests for user model
Merge user model conflict