Fix all the tests that broke in the update