we made the same change but I put this above gaiatest to avoid cascading deps. Can you rebase? Sorry, only just saw this PR.