added roles to user model, updated tests