fixed nasty email test blowing up build in test teardown/cleanup
fixed nasty email test blowing up build in test teardown/cleanup

srt32/fourthmeal,bwinterling/fourthmeal,srt32/fourthmeal,srt32/controller_refactoring,bwinterling/fourthmeal,srt32/controller_refactoring