Test output for roles; TH tests for roles
Fixing test cases to work with roles