Test Fixes - CPSites SF