Still trying to work out issues with gaia-ui-tests branch.