Merge "Add more role manager tests." into rvc-dev