Test Fixes - CPRolesCPSites - macros