Fix all of the tests