Minor Fixes for TestMail Function