Bug 934159 - [v1.2] Update gaia_test to be in line with master