Merge "use addClassResourceCleanup in test_roles"