test fix - combat caching on mail_settings
Merge pull request #3410 from eileenmcnaughton/testfixes_and_tidy_ups

test fix - combat caching on mail_settings