Update tests to work with Gaia test suite