Remove changes to tests that should not be in this pull request.