Merge "Update test expectations after rename."