Fix all the tests