fixing failing tests.