Renaming
Adding mail tests