Merge "Correct generic argument in test."