moar mail tests
Test refacto