Test Fixes - CPRoles - macros
Test Fixes - CPRoles - tests
LPS-40966
LPS-40966 SF