Merge "Fix Role tests"