Merge "Small cleanup of duplicated test values."