Fix a few test failures.