Updated Mail Tests