Fix all the tests in Zuul