Improve email testing