Test Fixes - SOSitesTestCase - macros