Rename macro

* Add functional Test
missing PageObjects