Refactor roles
Fixing tests - admin_controller#new_instructor