Test Fixes - CPCategories - macros
Test Fixes - CPCategories SF