Add some tests for Mail sending
merge