Upgrading tests to add checks for proper product/version grouping.
Merge pull request #1666 from brandonsavage/upgradetests

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