Fixes to ApplicationMailer tests in Rails 3