Some more work on fixing failing tests.