Upgrading tests to add checks for proper product/version grouping.

@peterbe r?