Merge "Fix test after rename."