Add some test + mail mock check ##