Fix a few more test issues.