Fix tests, adapt role tests to assert inclusion.