Fixed tests for Roles
Improve Roles model and tests