Fix tests that broke as a result of the pull request.