Test Fixes - CPPortalSettings - tests