Begin fixing failing tests.