fix spec to cover new changes and tweak mailer warning output.  Note: one intermittant failure test still out there