Enable tests to run on gaia v2.0

@AndreiH r?