3 model tests (Role, User, UserStoreRole)

* Model - Role
* Model - User
* Model - UserStoreRole

& refactor of user model spec using a refactor from chat with Gary.