Fix tests after pull request merge