Fix a few broken tests.