Fix a test and an issue.