Split accessors and prefs sections, fixed tests