* Using PageObjects on functional test
* minor improvements