Fixes to roles tests
More roles tests