Fix the rest of the tests