PrefServiceTest: merge in existing Prefs tests