Fix issues with tests after the last release.