Added mail steps and test