Fixes e-mail tests