Testing: More refactoring; move preferences tests out.
Authored by: ecarter 2008-03-29
Parent: [r6777]
Child: [r6779]