Merge "Update rbac tests"