updates to user model unit tests
Merge branch 'steve' into stephany