Added more test cases for mail service