Added some user model tests.
Merge branch 'conditional_show'