OP-764: Fixing Preference service controller tests...