Fix additional failing tests.