tidy up spree preferences testing support
Merge git://github.com/spree/spree