Start fixing failing tests.