Fix the tests on the latest master.