Rename macro

* Add functional Test
Actually I would add a PageObjects for the tree and have a method to wait until the tree is fully loaded which would also remove the need for the code below.