Rename macro

* Add functional Test
not needed since it's in the parent pom