user model tests are complete
Merge branch 'master' into status