Rename macro

* Add functional Test
why do you need to send mails in the tree macro??