Fix last failing tests.