Changes to support new gaia-ui-test location etc...