Fix failing spec tests
Farewell, role_type.