Fixing tests based on new products uses as fixtures
Merge branch 'master' into PIM-1430