Fix a few tests.