Like the pull request but with tests updated.