Fix Role related tests