* Using PageObjects on functional test
* Minor improvements