Update the tests to use zuul