Rename TestProduct to Product to avoid test failures

Change-Id: I9ab03f17dccc95d0b5e56a2b2300f08be285593f