Started fixing failing tests.