Improvements at test_Mail.h