Update of base.Role + tests

Should be OK now.