Fix tests and pull request issues.