Rename macro

* Add functional Test
typo too