* Rename macro
* Add functional Test