Fixing failing tests.