LPS-48779: Optimize UserGroupRoleServiceTest to do annotation based cleanup to run faster
LPS-49779 Source formatting
LPS-48779 Missed one spot