ThemeSetServiceTest modification