Fix falling tests.