Address review comments
Add wraper for gaia-ui-tests