Test Fixes - CPUsersandorganizations - paths
Test Fixes - CPUsersandorganizations - macros