Test Fixes - CPUsersandorganizations.testcase - paths
Test Fixes - CPUsersandorganizations.testcase - macros