Improve tests for new emails