added roles to user model and tests