Fix the tests that were broken by the last commit.